Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8006965: remove test_gamma and add dedicated test_* targets instead
Wed, 20 Mar 2013 17:04:45 -0700
- author
- twisti
- date
- Wed, 20 Mar 2013 17:04:45 -0700
- changeset 4780
- 98f3af397705
- parent 4779
- a59625d96f71
- child 4781
- 589aa23334ea
- child 4860
- 46f6f063b272
8006965: remove test_gamma and add dedicated test_* targets instead
Reviewed-by: kvn, jcoomes
| make/Makefile | file | annotate | diff | comparison | revisions | |
| make/bsd/Makefile | file | annotate | diff | comparison | revisions | |
| make/bsd/makefiles/buildtree.make | file | annotate | diff | comparison | revisions | |
| make/defs.make | file | annotate | diff | comparison | revisions | |
| make/linux/Makefile | file | annotate | diff | comparison | revisions | |
| make/linux/makefiles/buildtree.make | file | annotate | diff | comparison | revisions | |
| make/solaris/Makefile | file | annotate | diff | comparison | revisions | |
| make/solaris/makefiles/buildtree.make | file | annotate | diff | comparison | revisions | |
| make/test/Queens.java | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Makefile Wed Mar 20 07:05:40 2013 -0700 1.2 +++ b/make/Makefile Wed Mar 20 17:04:45 2013 -0700 1.3 @@ -532,6 +532,39 @@ 1.4 $(TAR) -cf - *) | \ 1.5 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 1.6 1.7 + 1.8 +# Testing the built JVM 1.9 +RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -Dsun.java.launcher=gamma 1.10 +generic_test: 1.11 + @$(ECHO) "Running with: $(ALTJVM_DIR)" 1.12 + @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion 1.13 + @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help 1.14 + 1.15 +# C2 test targets 1.16 +test_product test_optimized test_fastdebug test_jvmg: 1.17 + @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)" 1.18 + 1.19 +# C1 test targets 1.20 +test_product1 test_optimized1 test_fastdebug1 test_jvmg1: 1.21 + ifeq ($(ARCH_DATA_MODEL), 32) 1.22 + @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)" 1.23 + else 1.24 + @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 1.25 + endif 1.26 + 1.27 +# Zero test targets 1.28 +test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero: 1.29 + @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)" 1.30 + 1.31 +# Shark test targets 1.32 +test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark: 1.33 + @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)" 1.34 + 1.35 +# Minimal1 test targets 1.36 +test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1: 1.37 + @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)" 1.38 + 1.39 + 1.40 test_jdk: 1.41 ifeq ($(JVM_VARIANT_CLIENT), true) 1.42 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
2.1 --- a/make/bsd/Makefile Wed Mar 20 07:05:40 2013 -0700 2.2 +++ b/make/bsd/Makefile Wed Mar 20 17:04:45 2013 -0700 2.3 @@ -299,63 +299,42 @@ 2.4 2.5 $(TARGETS_C2): $(SUBDIRS_C2) 2.6 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 2.7 -ifeq ($(TEST_IN_BUILD),true) 2.8 - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 2.9 -endif 2.10 ifdef INSTALL 2.11 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 2.12 endif 2.13 2.14 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 2.15 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 2.16 -ifeq ($(TEST_IN_BUILD),true) 2.17 - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 2.18 -endif 2.19 ifdef INSTALL 2.20 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 2.21 endif 2.22 2.23 $(TARGETS_C1): $(SUBDIRS_C1) 2.24 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 2.25 -ifeq ($(TEST_IN_BUILD),true) 2.26 - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 2.27 -endif 2.28 ifdef INSTALL 2.29 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 2.30 endif 2.31 2.32 $(TARGETS_CORE): $(SUBDIRS_CORE) 2.33 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 2.34 -ifeq ($(TEST_IN_BUILD),true) 2.35 - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 2.36 -endif 2.37 ifdef INSTALL 2.38 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 2.39 endif 2.40 2.41 $(TARGETS_ZERO): $(SUBDIRS_ZERO) 2.42 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) 2.43 -ifeq ($(TEST_IN_BUILD),true) 2.44 - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma 2.45 -endif 2.46 ifdef INSTALL 2.47 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install 2.48 endif 2.49 2.50 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 2.51 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 2.52 -ifeq ($(TEST_IN_BUILD),true) 2.53 - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma 2.54 -endif 2.55 ifdef INSTALL 2.56 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 2.57 endif 2.58 2.59 $(TARGETS_MINIMAL1): $(SUBDIRS_MINIMAL1) 2.60 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) 2.61 -ifeq ($(TEST_IN_BUILD),true) 2.62 - cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && ./test_gamma 2.63 -endif 2.64 ifdef INSTALL 2.65 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install 2.66 endif
3.1 --- a/make/bsd/makefiles/buildtree.make Wed Mar 20 07:05:40 2013 -0700 3.2 +++ b/make/bsd/makefiles/buildtree.make Wed Mar 20 17:04:45 2013 -0700 3.3 @@ -50,7 +50,6 @@ 3.4 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 3.5 # sa.make - generate SA jar file and natives 3.6 # env.[ck]sh - environment settings 3.7 -# test_gamma - script to run the Queens program 3.8 # 3.9 # The makefiles are split this way so that "make foo" will run faster by not 3.10 # having to read the dependency files for the vm. 3.11 @@ -67,9 +66,6 @@ 3.12 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 3.13 QUIETLY$(MAKE_VERBOSE) = @ 3.14 3.15 -# For now, until the compiler is less wobbly: 3.16 -TESTFLAGS = -Xbatch -showversion 3.17 - 3.18 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 3.19 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero 3.20 else 3.21 @@ -135,7 +131,7 @@ 3.22 # dtrace.make is used on BSD versions that implement Dtrace (like MacOS X) 3.23 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make \ 3.24 jvmti.make sa.make dtrace.make \ 3.25 - env.sh env.csh jdkpath.sh .dbxrc test_gamma 3.26 + env.sh env.csh jdkpath.sh 3.27 3.28 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 3.29 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 3.30 @@ -352,7 +348,7 @@ 3.31 @echo Creating $@ ... 3.32 $(QUIETLY) ( \ 3.33 $(BUILDTREE_COMMENT); \ 3.34 - [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ 3.35 + { echo "JAVA_HOME=$(JDK_IMPORT_PATH)"; }; \ 3.36 { \ 3.37 echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \ 3.38 } | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \ 3.39 @@ -364,8 +360,7 @@ 3.40 @echo Creating $@ ... 3.41 $(QUIETLY) ( \ 3.42 $(BUILDTREE_COMMENT); \ 3.43 - [ -n "$$JAVA_HOME" ] && \ 3.44 - { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \ 3.45 + { echo "setenv JAVA_HOME \"$(JDK_IMPORT_PATH)\""; }; \ 3.46 sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \ 3.47 ) > $@ 3.48 3.49 @@ -376,119 +371,6 @@ 3.50 echo "JDK=${JAVA_HOME}"; \ 3.51 ) > $@ 3.52 3.53 -.dbxrc: $(BUILDTREE_MAKE) 3.54 - @echo Creating $@ ... 3.55 - $(QUIETLY) ( \ 3.56 - echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \ 3.57 - echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \ 3.58 - echo "then"; \ 3.59 - echo " source \"\$${HOTSPOT_DBXWARE}\""; \ 3.60 - echo "elif [ -f \"\$$HOME/.dbxrc\" ]"; \ 3.61 - echo "then"; \ 3.62 - echo " source \"\$$HOME/.dbxrc\""; \ 3.63 - echo "fi"; \ 3.64 - ) > $@ 3.65 - 3.66 -# Skip the test for product builds (which only work when installed in a JDK), to 3.67 -# avoid exiting with an error and causing make to halt. 3.68 -NO_TEST_MSG = \ 3.69 - echo "$@: skipping the test--this build must be tested in a JDK." 3.70 - 3.71 -NO_JAVA_HOME_MSG = \ 3.72 - echo "JAVA_HOME must be set to run this test." 3.73 - 3.74 -DATA_MODE = $(DATA_MODE/$(BUILDARCH)) 3.75 -JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) 3.76 - 3.77 -DATA_MODE/i486 = 32 3.78 -DATA_MODE/sparc = 32 3.79 -DATA_MODE/sparcv9 = 64 3.80 -DATA_MODE/amd64 = 64 3.81 -DATA_MODE/ia64 = 64 3.82 -DATA_MODE/zero = $(ARCH_DATA_MODEL) 3.83 - 3.84 -JAVA_FLAG/32 = -d32 3.85 -JAVA_FLAG/64 = -d64 3.86 - 3.87 -WRONG_DATA_MODE_MSG = \ 3.88 - echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK." 3.89 - 3.90 -CROSS_COMPILING_MSG = \ 3.91 - echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run." 3.92 - 3.93 -test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java 3.94 - @echo Creating $@ ... 3.95 - $(QUIETLY) ( \ 3.96 - echo "#!/bin/sh"; \ 3.97 - echo ""; \ 3.98 - $(BUILDTREE_COMMENT); \ 3.99 - echo ""; \ 3.100 - echo "# Include environment settings for gamma run"; \ 3.101 - echo ""; \ 3.102 - echo ". ./env.sh"; \ 3.103 - echo ""; \ 3.104 - echo "# Do not run gamma test for cross compiles"; \ 3.105 - echo ""; \ 3.106 - echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \ 3.107 - echo " $(CROSS_COMPILING_MSG)"; \ 3.108 - echo " exit 0"; \ 3.109 - echo "fi"; \ 3.110 - echo ""; \ 3.111 - echo "# Make sure JAVA_HOME is set as it is required for gamma"; \ 3.112 - echo ""; \ 3.113 - echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \ 3.114 - echo " $(NO_JAVA_HOME_MSG)"; \ 3.115 - echo " exit 0"; \ 3.116 - echo "fi"; \ 3.117 - echo ""; \ 3.118 - echo "# Check JAVA_HOME version to be used for the test"; \ 3.119 - echo ""; \ 3.120 - echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \ 3.121 - echo "if [ \$$? -ne 0 ]; then "; \ 3.122 - echo " $(WRONG_DATA_MODE_MSG)"; \ 3.123 - echo " exit 0"; \ 3.124 - echo "fi"; \ 3.125 - echo ""; \ 3.126 - echo "GAMMA_PROG=gamma"; \ 3.127 - echo ""; \ 3.128 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 3.129 - echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ 3.130 - echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ 3.131 - echo ""; \ 3.132 - echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \ 3.133 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \ 3.134 - echo " if [ ! -f \$${JVM_LIB} ]; then"; \ 3.135 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \ 3.136 - echo " fi"; \ 3.137 - echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \ 3.138 - echo " $(WRONG_DATA_MODE_MSG)"; \ 3.139 - echo " exit 0"; \ 3.140 - echo " fi"; \ 3.141 - echo "fi"; \ 3.142 - echo ""; \ 3.143 - echo "# Compile Queens program for test"; \ 3.144 - echo ""; \ 3.145 - echo "rm -f Queens.class"; \ 3.146 - echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ 3.147 - echo ""; \ 3.148 - echo "# Set library path solely for gamma launcher test run"; \ 3.149 - echo ""; \ 3.150 - echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 3.151 - echo "export LD_LIBRARY_PATH"; \ 3.152 - echo "unset LD_LIBRARY_PATH_32"; \ 3.153 - echo "unset LD_LIBRARY_PATH_64"; \ 3.154 - echo ""; \ 3.155 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 3.156 - echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 3.157 - echo " export DYLD_LIBRARY_PATH"; \ 3.158 - echo "fi"; \ 3.159 - echo ""; \ 3.160 - echo "# Use the gamma launcher and JAVA_HOME to run the test"; \ 3.161 - echo ""; \ 3.162 - echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \ 3.163 - ) > $@ 3.164 - $(QUIETLY) chmod +x $@ 3.165 - 3.166 FORCE: 3.167 3.168 .PHONY: all FORCE
4.1 --- a/make/defs.make Wed Mar 20 07:05:40 2013 -0700 4.2 +++ b/make/defs.make Wed Mar 20 17:04:45 2013 -0700 4.3 @@ -302,7 +302,7 @@ 4.4 endif 4.5 4.6 # Required make macro settings for all platforms 4.7 -MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) 4.8 +MAKE_ARGS += BOOTDIR=$(ABS_BOOTDIR) 4.9 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) 4.10 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) 4.11 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) 4.12 @@ -337,9 +337,6 @@ 4.13 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 4.14 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 4.15 4.16 -# By default, run Queens test after building 4.17 -TEST_IN_BUILD ?= true 4.18 - 4.19 ifndef JAVASE_EMBEDDED 4.20 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h 4.21 endif
5.1 --- a/make/linux/Makefile Wed Mar 20 07:05:40 2013 -0700 5.2 +++ b/make/linux/Makefile Wed Mar 20 17:04:45 2013 -0700 5.3 @@ -300,63 +300,42 @@ 5.4 5.5 $(TARGETS_C2): $(SUBDIRS_C2) 5.6 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 5.7 -ifeq ($(TEST_IN_BUILD),true) 5.8 - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 5.9 -endif 5.10 ifdef INSTALL 5.11 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 5.12 endif 5.13 5.14 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 5.15 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 5.16 -ifeq ($(TEST_IN_BUILD),true) 5.17 - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 5.18 -endif 5.19 ifdef INSTALL 5.20 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 5.21 endif 5.22 5.23 $(TARGETS_C1): $(SUBDIRS_C1) 5.24 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 5.25 -ifeq ($(TEST_IN_BUILD),true) 5.26 - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 5.27 -endif 5.28 ifdef INSTALL 5.29 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 5.30 endif 5.31 5.32 $(TARGETS_CORE): $(SUBDIRS_CORE) 5.33 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 5.34 -ifeq ($(TEST_IN_BUILD),true) 5.35 - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 5.36 -endif 5.37 ifdef INSTALL 5.38 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 5.39 endif 5.40 5.41 $(TARGETS_ZERO): $(SUBDIRS_ZERO) 5.42 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) 5.43 -ifeq ($(TEST_IN_BUILD),true) 5.44 - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma 5.45 -endif 5.46 ifdef INSTALL 5.47 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install 5.48 endif 5.49 5.50 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 5.51 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 5.52 -ifeq ($(TEST_IN_BUILD),true) 5.53 - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma 5.54 -endif 5.55 ifdef INSTALL 5.56 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 5.57 endif 5.58 5.59 $(TARGETS_MINIMAL1): $(SUBDIRS_MINIMAL1) 5.60 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) 5.61 -ifeq ($(TEST_IN_BUILD),true) 5.62 - cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && ./test_gamma 5.63 -endif 5.64 ifdef INSTALL 5.65 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install 5.66 endif
6.1 --- a/make/linux/makefiles/buildtree.make Wed Mar 20 07:05:40 2013 -0700 6.2 +++ b/make/linux/makefiles/buildtree.make Wed Mar 20 17:04:45 2013 -0700 6.3 @@ -50,7 +50,6 @@ 6.4 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 6.5 # sa.make - generate SA jar file and natives 6.6 # env.[ck]sh - environment settings 6.7 -# test_gamma - script to run the Queens program 6.8 # 6.9 # The makefiles are split this way so that "make foo" will run faster by not 6.10 # having to read the dependency files for the vm. 6.11 @@ -64,9 +63,6 @@ 6.12 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 6.13 QUIETLY$(MAKE_VERBOSE) = @ 6.14 6.15 -# For now, until the compiler is less wobbly: 6.16 -TESTFLAGS = -Xbatch -showversion 6.17 - 6.18 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 6.19 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero 6.20 else 6.21 @@ -128,7 +124,7 @@ 6.22 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make 6.23 6.24 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \ 6.25 - env.sh env.csh jdkpath.sh .dbxrc test_gamma 6.26 + env.sh env.csh jdkpath.sh 6.27 6.28 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 6.29 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 6.30 @@ -345,7 +341,7 @@ 6.31 @echo Creating $@ ... 6.32 $(QUIETLY) ( \ 6.33 $(BUILDTREE_COMMENT); \ 6.34 - [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ 6.35 + { echo "JAVA_HOME=$(JDK_IMPORT_PATH)"; }; \ 6.36 { \ 6.37 echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \ 6.38 } | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \ 6.39 @@ -357,8 +353,7 @@ 6.40 @echo Creating $@ ... 6.41 $(QUIETLY) ( \ 6.42 $(BUILDTREE_COMMENT); \ 6.43 - [ -n "$$JAVA_HOME" ] && \ 6.44 - { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \ 6.45 + { echo "setenv JAVA_HOME \"$(JDK_IMPORT_PATH)\""; }; \ 6.46 sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \ 6.47 ) > $@ 6.48 6.49 @@ -369,119 +364,6 @@ 6.50 echo "JDK=${JAVA_HOME}"; \ 6.51 ) > $@ 6.52 6.53 -.dbxrc: $(BUILDTREE_MAKE) 6.54 - @echo Creating $@ ... 6.55 - $(QUIETLY) ( \ 6.56 - echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \ 6.57 - echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \ 6.58 - echo "then"; \ 6.59 - echo " source \"\$${HOTSPOT_DBXWARE}\""; \ 6.60 - echo "elif [ -f \"\$$HOME/.dbxrc\" ]"; \ 6.61 - echo "then"; \ 6.62 - echo " source \"\$$HOME/.dbxrc\""; \ 6.63 - echo "fi"; \ 6.64 - ) > $@ 6.65 - 6.66 -# Skip the test for product builds (which only work when installed in a JDK), to 6.67 -# avoid exiting with an error and causing make to halt. 6.68 -NO_TEST_MSG = \ 6.69 - echo "$@: skipping the test--this build must be tested in a JDK." 6.70 - 6.71 -NO_JAVA_HOME_MSG = \ 6.72 - echo "JAVA_HOME must be set to run this test." 6.73 - 6.74 -DATA_MODE = $(DATA_MODE/$(BUILDARCH)) 6.75 -JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) 6.76 - 6.77 -DATA_MODE/i486 = 32 6.78 -DATA_MODE/sparc = 32 6.79 -DATA_MODE/sparcv9 = 64 6.80 -DATA_MODE/amd64 = 64 6.81 -DATA_MODE/ia64 = 64 6.82 -DATA_MODE/zero = $(ARCH_DATA_MODEL) 6.83 - 6.84 -JAVA_FLAG/32 = -d32 6.85 -JAVA_FLAG/64 = -d64 6.86 - 6.87 -WRONG_DATA_MODE_MSG = \ 6.88 - echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK." 6.89 - 6.90 -CROSS_COMPILING_MSG = \ 6.91 - echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run." 6.92 - 6.93 -test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java 6.94 - @echo Creating $@ ... 6.95 - $(QUIETLY) ( \ 6.96 - echo "#!/bin/sh"; \ 6.97 - echo ""; \ 6.98 - $(BUILDTREE_COMMENT); \ 6.99 - echo ""; \ 6.100 - echo "# Include environment settings for gamma run"; \ 6.101 - echo ""; \ 6.102 - echo ". ./env.sh"; \ 6.103 - echo ""; \ 6.104 - echo "# Do not run gamma test for cross compiles"; \ 6.105 - echo ""; \ 6.106 - echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \ 6.107 - echo " $(CROSS_COMPILING_MSG)"; \ 6.108 - echo " exit 0"; \ 6.109 - echo "fi"; \ 6.110 - echo ""; \ 6.111 - echo "# Make sure JAVA_HOME is set as it is required for gamma"; \ 6.112 - echo ""; \ 6.113 - echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \ 6.114 - echo " $(NO_JAVA_HOME_MSG)"; \ 6.115 - echo " exit 0"; \ 6.116 - echo "fi"; \ 6.117 - echo ""; \ 6.118 - echo "# Check JAVA_HOME version to be used for the test"; \ 6.119 - echo ""; \ 6.120 - echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \ 6.121 - echo "if [ \$$? -ne 0 ]; then "; \ 6.122 - echo " $(WRONG_DATA_MODE_MSG)"; \ 6.123 - echo " exit 0"; \ 6.124 - echo "fi"; \ 6.125 - echo ""; \ 6.126 - echo "GAMMA_PROG=gamma"; \ 6.127 - echo ""; \ 6.128 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 6.129 - echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ 6.130 - echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ 6.131 - echo ""; \ 6.132 - echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \ 6.133 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \ 6.134 - echo " if [ ! -f \$${JVM_LIB} ]; then"; \ 6.135 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \ 6.136 - echo " fi"; \ 6.137 - echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \ 6.138 - echo " $(WRONG_DATA_MODE_MSG)"; \ 6.139 - echo " exit 0"; \ 6.140 - echo " fi"; \ 6.141 - echo "fi"; \ 6.142 - echo ""; \ 6.143 - echo "# Compile Queens program for test"; \ 6.144 - echo ""; \ 6.145 - echo "rm -f Queens.class"; \ 6.146 - echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ 6.147 - echo ""; \ 6.148 - echo "# Set library path solely for gamma launcher test run"; \ 6.149 - echo ""; \ 6.150 - echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 6.151 - echo "export LD_LIBRARY_PATH"; \ 6.152 - echo "unset LD_LIBRARY_PATH_32"; \ 6.153 - echo "unset LD_LIBRARY_PATH_64"; \ 6.154 - echo ""; \ 6.155 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 6.156 - echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 6.157 - echo " export DYLD_LIBRARY_PATH"; \ 6.158 - echo "fi"; \ 6.159 - echo ""; \ 6.160 - echo "# Use the gamma launcher and JAVA_HOME to run the test"; \ 6.161 - echo ""; \ 6.162 - echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \ 6.163 - ) > $@ 6.164 - $(QUIETLY) chmod +x $@ 6.165 - 6.166 FORCE: 6.167 6.168 .PHONY: all FORCE
7.1 --- a/make/solaris/Makefile Wed Mar 20 07:05:40 2013 -0700 7.2 +++ b/make/solaris/Makefile Wed Mar 20 17:04:45 2013 -0700 7.3 @@ -231,36 +231,24 @@ 7.4 7.5 $(TARGETS_C2): $(SUBDIRS_C2) 7.6 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 7.7 -ifeq ($(TEST_IN_BUILD),true) 7.8 - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 7.9 -endif 7.10 ifdef INSTALL 7.11 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 7.12 endif 7.13 7.14 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 7.15 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 7.16 -ifeq ($(TEST_IN_BUILD),true) 7.17 - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 7.18 -endif 7.19 ifdef INSTALL 7.20 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 7.21 endif 7.22 7.23 $(TARGETS_C1): $(SUBDIRS_C1) 7.24 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 7.25 -ifeq ($(TEST_IN_BUILD),true) 7.26 - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 7.27 -endif 7.28 ifdef INSTALL 7.29 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 7.30 endif 7.31 7.32 $(TARGETS_CORE): $(SUBDIRS_CORE) 7.33 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 7.34 -ifeq ($(TEST_IN_BUILD),true) 7.35 - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 7.36 -endif 7.37 ifdef INSTALL 7.38 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 7.39 endif
8.1 --- a/make/solaris/makefiles/buildtree.make Wed Mar 20 07:05:40 2013 -0700 8.2 +++ b/make/solaris/makefiles/buildtree.make Wed Mar 20 17:04:45 2013 -0700 8.3 @@ -50,21 +50,19 @@ 8.4 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 8.5 # sa.make - generate SA jar file and natives 8.6 # env.[ck]sh - environment settings 8.7 -# test_gamma - script to run the Queens program 8.8 # 8.9 # The makefiles are split this way so that "make foo" will run faster by not 8.10 # having to read the dependency files for the vm. 8.11 8.12 -include $(SPEC) 8.13 include $(GAMMADIR)/make/scm.make 8.14 +include $(GAMMADIR)/make/defs.make 8.15 include $(GAMMADIR)/make/altsrc.make 8.16 8.17 + 8.18 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details. 8.19 QUIETLY$(MAKE_VERBOSE) = @ 8.20 8.21 -# For now, until the compiler is less wobbly: 8.22 -TESTFLAGS = -Xbatch -Xmx32m -showversion 8.23 - 8.24 ### maye ARCH_XXX instead? 8.25 ifdef USE_GCC 8.26 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).gcc 8.27 @@ -119,7 +117,7 @@ 8.28 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make 8.29 8.30 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \ 8.31 - env.sh env.csh jdkpath.sh .dbxrc test_gamma 8.32 + env.sh env.csh jdkpath.sh 8.33 8.34 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 8.35 ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 8.36 @@ -334,7 +332,7 @@ 8.37 @echo Creating $@ ... 8.38 $(QUIETLY) ( \ 8.39 $(BUILDTREE_COMMENT); \ 8.40 - [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ 8.41 + { echo "JAVA_HOME=$(JDK_IMPORT_PATH)"; }; \ 8.42 { \ 8.43 echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \ 8.44 } | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \ 8.45 @@ -346,8 +344,7 @@ 8.46 @echo Creating $@ ... 8.47 $(QUIETLY) ( \ 8.48 $(BUILDTREE_COMMENT); \ 8.49 - [ -n "$$JAVA_HOME" ] && \ 8.50 - { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \ 8.51 + { echo "setenv JAVA_HOME \"$(JDK_IMPORT_PATH)\""; }; \ 8.52 sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \ 8.53 ) > $@ 8.54 8.55 @@ -358,124 +355,6 @@ 8.56 echo "JDK=${JAVA_HOME}"; \ 8.57 ) > $@ 8.58 8.59 -.dbxrc: $(BUILDTREE_MAKE) 8.60 - @echo Creating $@ ... 8.61 - $(QUIETLY) ( \ 8.62 - echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \ 8.63 - echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \ 8.64 - echo "then"; \ 8.65 - echo " source \"\$${HOTSPOT_DBXWARE}\""; \ 8.66 - echo "elif [ -f \"\$$HOME/.dbxrc\" ]"; \ 8.67 - echo "then"; \ 8.68 - echo " source \"\$$HOME/.dbxrc\""; \ 8.69 - echo "fi"; \ 8.70 - ) > $@ 8.71 - 8.72 -# Skip the test for product builds (which only work when installed in a JDK), to 8.73 -# avoid exiting with an error and causing make to halt. 8.74 -NO_TEST_MSG = \ 8.75 - echo "$@: skipping the test--this build must be tested in a JDK." 8.76 - 8.77 -NO_JAVA_HOME_MSG = \ 8.78 - echo "JAVA_HOME must be set to run this test." 8.79 - 8.80 -DATA_MODE = $(DATA_MODE/$(BUILDARCH)) 8.81 -JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) 8.82 - 8.83 -DATA_MODE/i486 = 32 8.84 -DATA_MODE/sparc = 32 8.85 -DATA_MODE/sparcv9 = 64 8.86 -DATA_MODE/amd64 = 64 8.87 -DATA_MODE/ia64 = 64 8.88 - 8.89 -# This bit is needed to enable local rebuilds. 8.90 -# Unless the makefile itself sets LP64, any environmental 8.91 -# setting of LP64 will interfere with the build. 8.92 -LP64_SETTING/32 = LP64 = \#empty 8.93 -LP64_SETTING/64 = LP64 = 1 8.94 - 8.95 -JAVA_FLAG/32 = -d32 8.96 -JAVA_FLAG/64 = -d64 8.97 - 8.98 -WRONG_DATA_MODE_MSG = \ 8.99 - echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK." 8.100 - 8.101 -CROSS_COMPILING_MSG = \ 8.102 - echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run." 8.103 - 8.104 -test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java 8.105 - @echo Creating $@ ... 8.106 - $(QUIETLY) ( \ 8.107 - echo "#!/bin/sh"; \ 8.108 - echo ""; \ 8.109 - $(BUILDTREE_COMMENT); \ 8.110 - echo ""; \ 8.111 - echo "# Include environment settings for gamma run"; \ 8.112 - echo ""; \ 8.113 - echo ". ./env.sh"; \ 8.114 - echo ""; \ 8.115 - echo "# Do not run gamma test for cross compiles"; \ 8.116 - echo ""; \ 8.117 - echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \ 8.118 - echo " $(CROSS_COMPILING_MSG)"; \ 8.119 - echo " exit 0"; \ 8.120 - echo "fi"; \ 8.121 - echo ""; \ 8.122 - echo "# Make sure JAVA_HOME is set as it is required for gamma"; \ 8.123 - echo ""; \ 8.124 - echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \ 8.125 - echo " $(NO_JAVA_HOME_MSG)"; \ 8.126 - echo " exit 0"; \ 8.127 - echo "fi"; \ 8.128 - echo ""; \ 8.129 - echo "# Check JAVA_HOME version to be used for the test"; \ 8.130 - echo ""; \ 8.131 - echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \ 8.132 - echo "if [ \$$? -ne 0 ]; then "; \ 8.133 - echo " $(WRONG_DATA_MODE_MSG)"; \ 8.134 - echo " exit 0"; \ 8.135 - echo "fi"; \ 8.136 - echo ""; \ 8.137 - echo "GAMMA_PROG=gamma"; \ 8.138 - echo ""; \ 8.139 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 8.140 - echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ 8.141 - echo " # NOTE: gamma assumes the OpenJDK directory layout."; \ 8.142 - echo ""; \ 8.143 - echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \ 8.144 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \ 8.145 - echo " if [ ! -f \$${JVM_LIB} ]; then"; \ 8.146 - echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \ 8.147 - echo " fi"; \ 8.148 - echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \ 8.149 - echo " $(WRONG_DATA_MODE_MSG)"; \ 8.150 - echo " exit 0"; \ 8.151 - echo " fi"; \ 8.152 - echo "fi"; \ 8.153 - echo ""; \ 8.154 - echo "# Compile Queens program for test"; \ 8.155 - echo ""; \ 8.156 - echo "rm -f Queens.class"; \ 8.157 - echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ 8.158 - echo ""; \ 8.159 - echo "# Set library path solely for gamma launcher test run"; \ 8.160 - echo ""; \ 8.161 - echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 8.162 - echo "export LD_LIBRARY_PATH"; \ 8.163 - echo "unset LD_LIBRARY_PATH_32"; \ 8.164 - echo "unset LD_LIBRARY_PATH_64"; \ 8.165 - echo ""; \ 8.166 - echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ 8.167 - echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \ 8.168 - echo " export DYLD_LIBRARY_PATH"; \ 8.169 - echo "fi"; \ 8.170 - echo ""; \ 8.171 - echo "# Use the gamma launcher and JAVA_HOME to run the test"; \ 8.172 - echo ""; \ 8.173 - echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \ 8.174 - ) > $@ 8.175 - $(QUIETLY) chmod +x $@ 8.176 - 8.177 FORCE: 8.178 8.179 .PHONY: all FORCE
9.1 --- a/make/test/Queens.java Wed Mar 20 07:05:40 2013 -0700 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,86 +0,0 @@ 9.4 -/* 9.5 - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. 9.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.7 - * 9.8 - * This code is free software; you can redistribute it and/or modify it 9.9 - * under the terms of the GNU General Public License version 2 only, as 9.10 - * published by the Free Software Foundation. 9.11 - * 9.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 9.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.15 - * version 2 for more details (a copy is included in the LICENSE file that 9.16 - * accompanied this code). 9.17 - * 9.18 - * You should have received a copy of the GNU General Public License version 9.19 - * 2 along with this work; if not, write to the Free Software Foundation, 9.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.21 - * 9.22 - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 9.23 - * or visit www.oracle.com if you need additional information or have any 9.24 - * questions. 9.25 - * 9.26 - */ 9.27 - 9.28 -import java.util.*; 9.29 - 9.30 -// Copyright 1996, Animorphic Systems 9.31 -// gri 28 Aug 92 / 15 Jan 93 / 8 Dec 95 9.32 - 9.33 -class Queens { 9.34 - 9.35 - static void try_i(boolean a[], boolean b[], boolean c[], int x[], int i) { 9.36 - int adj = 7; 9.37 - 9.38 - for (int j = 1; j <= 8; j++) { 9.39 - if (b[j] && a[i+j] && c[adj+i-j]) { 9.40 - x[i] = j; 9.41 - b[j] = false; 9.42 - a[i+j] = false; 9.43 - c[adj+i-j] = false; 9.44 - if (i < 8) try_i(a, b, c, x, i+1); 9.45 - else print(x); 9.46 - b[j] = true; 9.47 - a[i+j] = true; 9.48 - c[adj+i-j] = true; 9.49 - } 9.50 - } 9.51 - } 9.52 - 9.53 - public static void main(String s[]) { 9.54 - boolean a[] = new boolean[16+1]; 9.55 - boolean b[] = new boolean[ 8+1]; 9.56 - boolean c[] = new boolean[14+1]; 9.57 - int x[] = new int[8+1]; 9.58 - int adj = 7; 9.59 - 9.60 - for (int i = -7; i <= 16; i++) { 9.61 - if (i >= 1 && i <= 8) b[i] = true; 9.62 - if (i >= 2) a[i] = true; 9.63 - if (i <= 7) c[adj+i] = true; 9.64 - } 9.65 - 9.66 - x[0] = 0; // solution counter 9.67 - 9.68 - try_i(a, b, c, x, 1); 9.69 - } 9.70 - 9.71 - static void print(int x[]) { 9.72 - // first correct solution: A1 B5 C8 D6 E3 F7 G2 H4 9.73 - 9.74 - char LF = (char)0xA; 9.75 - char CR = (char)0xD; 9.76 - 9.77 - x[0]++; 9.78 - if (x[0] < 10) 9.79 - System.out.print(" "); 9.80 - System.out.print(x[0] + ". "); 9.81 - for (int i = 1; i <= 8; i++) { 9.82 - char p = (char)('A' + i - 1); 9.83 - System.out.print(p); 9.84 - System.out.print (x[i] + " "); 9.85 - } 9.86 - System.out.println(); 9.87 - } 9.88 - 9.89 -};
