comparison make/bsd/Makefile @ 8780:98f3af397705

8006965: remove test_gamma and add dedicated test_* targets instead Reviewed-by: kvn, jcoomes
author twisti
date Wed, 20 Mar 2013 17:04:45 -0700
parents 892acf0431ef
children b9a918201d47 f36e073d56a4
comparison
equal deleted inserted replaced
8779:a59625d96f71 8780:98f3af397705
297 297
298 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 298 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
299 299
300 $(TARGETS_C2): $(SUBDIRS_C2) 300 $(TARGETS_C2): $(SUBDIRS_C2)
301 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 301 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
302 ifeq ($(TEST_IN_BUILD),true)
303 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
304 endif
305 ifdef INSTALL 302 ifdef INSTALL
306 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 303 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
307 endif 304 endif
308 305
309 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 306 $(TARGETS_TIERED): $(SUBDIRS_TIERED)
310 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 307 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
311 ifeq ($(TEST_IN_BUILD),true)
312 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
313 endif
314 ifdef INSTALL 308 ifdef INSTALL
315 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 309 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
316 endif 310 endif
317 311
318 $(TARGETS_C1): $(SUBDIRS_C1) 312 $(TARGETS_C1): $(SUBDIRS_C1)
319 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 313 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
320 ifeq ($(TEST_IN_BUILD),true)
321 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
322 endif
323 ifdef INSTALL 314 ifdef INSTALL
324 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 315 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
325 endif 316 endif
326 317
327 $(TARGETS_CORE): $(SUBDIRS_CORE) 318 $(TARGETS_CORE): $(SUBDIRS_CORE)
328 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 319 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
329 ifeq ($(TEST_IN_BUILD),true)
330 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
331 endif
332 ifdef INSTALL 320 ifdef INSTALL
333 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 321 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
334 endif 322 endif
335 323
336 $(TARGETS_ZERO): $(SUBDIRS_ZERO) 324 $(TARGETS_ZERO): $(SUBDIRS_ZERO)
337 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) 325 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
338 ifeq ($(TEST_IN_BUILD),true)
339 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
340 endif
341 ifdef INSTALL 326 ifdef INSTALL
342 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install 327 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
343 endif 328 endif
344 329
345 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 330 $(TARGETS_SHARK): $(SUBDIRS_SHARK)
346 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 331 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
347 ifeq ($(TEST_IN_BUILD),true)
348 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
349 endif
350 ifdef INSTALL 332 ifdef INSTALL
351 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 333 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
352 endif 334 endif
353 335
354 $(TARGETS_MINIMAL1): $(SUBDIRS_MINIMAL1) 336 $(TARGETS_MINIMAL1): $(SUBDIRS_MINIMAL1)
355 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) 337 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS)
356 ifeq ($(TEST_IN_BUILD),true)
357 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && ./test_gamma
358 endif
359 ifdef INSTALL 338 ifdef INSTALL
360 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install 339 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install
361 endif 340 endif
362 341
363 # Just build the tree, and nothing else: 342 # Just build the tree, and nothing else: