Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/bsd/Makefile	Mon Sep 17 11:46:19 2012 +0200
     1.2 +++ b/make/bsd/Makefile	Mon Sep 17 11:46:25 2012 -0700
     1.3 @@ -288,42 +288,54 @@
     1.4  
     1.5  $(TARGETS_C2):  $(SUBDIRS_C2)
     1.6  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
     1.7 +ifeq ($(TEST_IN_BUILD),true)
     1.8  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
     1.9 +endif
    1.10  ifdef INSTALL
    1.11  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
    1.12  endif
    1.13  
    1.14  $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
    1.15  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
    1.16 +ifeq ($(TEST_IN_BUILD),true)
    1.17  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
    1.18 +endif
    1.19  ifdef INSTALL
    1.20  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
    1.21  endif
    1.22  
    1.23  $(TARGETS_C1):  $(SUBDIRS_C1)
    1.24  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
    1.25 +ifeq ($(TEST_IN_BUILD),true)
    1.26  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
    1.27 +endif
    1.28  ifdef INSTALL
    1.29  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
    1.30  endif
    1.31  
    1.32  $(TARGETS_CORE):  $(SUBDIRS_CORE)
    1.33  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
    1.34 +ifeq ($(TEST_IN_BUILD),true)
    1.35  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
    1.36 +endif
    1.37  ifdef INSTALL
    1.38  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
    1.39  endif
    1.40  
    1.41  $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
    1.42  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
    1.43 +ifeq ($(TEST_IN_BUILD),true)
    1.44  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
    1.45 +endif
    1.46  ifdef INSTALL
    1.47  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
    1.48  endif
    1.49  
    1.50  $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
    1.51  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
    1.52 +ifeq ($(TEST_IN_BUILD),true)
    1.53  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
    1.54 +endif
    1.55  ifdef INSTALL
    1.56  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
    1.57  endif

     2.1 --- a/make/defs.make	Mon Sep 17 11:46:19 2012 +0200
     2.2 +++ b/make/defs.make	Mon Sep 17 11:46:25 2012 -0700
     2.3 @@ -332,6 +332,9 @@
     2.4  EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
     2.5  EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
     2.6  
     2.7 +# By default, run Queens test after building
     2.8 +TEST_IN_BUILD ?= true
     2.9 +
    2.10  ifndef JAVASE_EMBEDDED
    2.11  EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
    2.12  endif

     3.1 --- a/make/linux/Makefile	Mon Sep 17 11:46:19 2012 +0200
     3.2 +++ b/make/linux/Makefile	Mon Sep 17 11:46:25 2012 -0700
     3.3 @@ -288,42 +288,54 @@
     3.4  
     3.5  $(TARGETS_C2):  $(SUBDIRS_C2)
     3.6  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
     3.7 +ifeq ($(TEST_IN_BUILD),true)
     3.8  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
     3.9 +endif
    3.10  ifdef INSTALL
    3.11  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
    3.12  endif
    3.13  
    3.14  $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
    3.15  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
    3.16 +ifeq ($(TEST_IN_BUILD),true)
    3.17  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
    3.18 +endif
    3.19  ifdef INSTALL
    3.20  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
    3.21  endif
    3.22  
    3.23  $(TARGETS_C1):  $(SUBDIRS_C1)
    3.24  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
    3.25 +ifeq ($(TEST_IN_BUILD),true)
    3.26  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
    3.27 +endif
    3.28  ifdef INSTALL
    3.29  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
    3.30  endif
    3.31  
    3.32  $(TARGETS_CORE):  $(SUBDIRS_CORE)
    3.33  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
    3.34 +ifeq ($(TEST_IN_BUILD),true)
    3.35  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
    3.36 +endif
    3.37  ifdef INSTALL
    3.38  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
    3.39  endif
    3.40  
    3.41  $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
    3.42  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
    3.43 +ifeq ($(TEST_IN_BUILD),true)
    3.44  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
    3.45 +endif
    3.46  ifdef INSTALL
    3.47  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
    3.48  endif
    3.49  
    3.50  $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
    3.51  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
    3.52 +ifeq ($(TEST_IN_BUILD),true)
    3.53  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
    3.54 +endif
    3.55  ifdef INSTALL
    3.56  	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
    3.57  endif

     4.1 --- a/make/solaris/Makefile	Mon Sep 17 11:46:19 2012 +0200
     4.2 +++ b/make/solaris/Makefile	Mon Sep 17 11:46:25 2012 -0700
     4.3 @@ -237,35 +237,45 @@
     4.4  
     4.5  $(TARGETS_C2):  $(SUBDIRS_C2)
     4.6  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
     4.7 +ifeq ($(TEST_IN_BUILD),true)
     4.8  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
     4.9 +endif
    4.10  ifdef INSTALL
    4.11  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
    4.12  endif
    4.13  
    4.14  $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
    4.15  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
    4.16 +ifeq ($(TEST_IN_BUILD),true)
    4.17  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
    4.18 +endif
    4.19  ifdef INSTALL
    4.20  	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
    4.21  endif
    4.22  
    4.23  $(TARGETS_C1):  $(SUBDIRS_C1)
    4.24  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
    4.25 +ifeq ($(TEST_IN_BUILD),true)
    4.26  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
    4.27 +endif
    4.28  ifdef INSTALL
    4.29  	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
    4.30  endif
    4.31  
    4.32  $(TARGETS_CORE):  $(SUBDIRS_CORE)
    4.33  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
    4.34 +ifeq ($(TEST_IN_BUILD),true)
    4.35  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
    4.36 +endif
    4.37  ifdef INSTALL
    4.38  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
    4.39  endif
    4.40  
    4.41  $(TARGETS_KERNEL):  $(SUBDIRS_KERNEL)
    4.42  	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
    4.43 +ifeq ($(TEST_IN_BUILD),true)
    4.44  	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
    4.45 +endif
    4.46  ifdef INSTALL
    4.47  	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
    4.48  endif