comparison make/linux/Makefile @ 6774:989cf02ca531

7172012: Make test-in-build an option (Queens) Reviewed-by: ohair, dholmes
author ihse
date Mon, 17 Sep 2012 11:46:25 -0700
parents 74c359c4a9e5
children fb19af007ffc
comparison
equal deleted inserted replaced
6765:15ba0e7a3ff4 6774:989cf02ca531
286 286
287 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 287 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
288 288
289 $(TARGETS_C2): $(SUBDIRS_C2) 289 $(TARGETS_C2): $(SUBDIRS_C2)
290 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 290 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
291 ifeq ($(TEST_IN_BUILD),true)
291 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 292 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
293 endif
292 ifdef INSTALL 294 ifdef INSTALL
293 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 295 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
294 endif 296 endif
295 297
296 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 298 $(TARGETS_TIERED): $(SUBDIRS_TIERED)
297 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 299 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
300 ifeq ($(TEST_IN_BUILD),true)
298 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 301 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
302 endif
299 ifdef INSTALL 303 ifdef INSTALL
300 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 304 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
301 endif 305 endif
302 306
303 $(TARGETS_C1): $(SUBDIRS_C1) 307 $(TARGETS_C1): $(SUBDIRS_C1)
304 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 308 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
309 ifeq ($(TEST_IN_BUILD),true)
305 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 310 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
311 endif
306 ifdef INSTALL 312 ifdef INSTALL
307 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 313 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
308 endif 314 endif
309 315
310 $(TARGETS_CORE): $(SUBDIRS_CORE) 316 $(TARGETS_CORE): $(SUBDIRS_CORE)
311 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 317 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
318 ifeq ($(TEST_IN_BUILD),true)
312 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 319 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
320 endif
313 ifdef INSTALL 321 ifdef INSTALL
314 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 322 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
315 endif 323 endif
316 324
317 $(TARGETS_ZERO): $(SUBDIRS_ZERO) 325 $(TARGETS_ZERO): $(SUBDIRS_ZERO)
318 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) 326 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
327 ifeq ($(TEST_IN_BUILD),true)
319 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma 328 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
329 endif
320 ifdef INSTALL 330 ifdef INSTALL
321 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install 331 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
322 endif 332 endif
323 333
324 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 334 $(TARGETS_SHARK): $(SUBDIRS_SHARK)
325 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 335 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
336 ifeq ($(TEST_IN_BUILD),true)
326 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma 337 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
338 endif
327 ifdef INSTALL 339 ifdef INSTALL
328 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 340 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
329 endif 341 endif
330 342
331 # Just build the tree, and nothing else: 343 # Just build the tree, and nothing else: