1.1 --- a/make/Makefile Mon Feb 13 02:29:22 2012 -0800 1.2 +++ b/make/Makefile Mon Feb 13 04:30:59 2012 -0800 1.3 @@ -402,7 +402,6 @@ 1.4 $(install-file) 1.5 else 1.6 $(EXPORT_INCLUDE_DIR)/jfr.h: 1.7 - 1.8 endif 1.9 1.10 # Doc files (jvmti.html) 1.11 @@ -448,12 +447,18 @@ 1.12 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 1.13 1.14 test_jdk: 1.15 - ifneq ($(ZERO_BUILD), true) 1.16 ifeq ($(ARCH_DATA_MODEL), 32) 1.17 - $(JDK_IMAGE_DIR)/bin/java -client -version 1.18 + ifneq ($(ZERO_BUILD), true) 1.19 + $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion 1.20 + $(JDK_IMAGE_DIR)/bin/java -d32 -client -version 1.21 + endif 1.22 + $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion 1.23 + $(JDK_IMAGE_DIR)/bin/java -d32 -server -version 1.24 endif 1.25 - endif 1.26 - $(JDK_IMAGE_DIR)/bin/java -server -version 1.27 + ifeq ($(ARCH_DATA_MODEL), 64) 1.28 + $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion 1.29 + $(JDK_IMAGE_DIR)/bin/java -d64 -server -version 1.30 + endif 1.31 1.32 copy_product_jdk:: 1.33 $(RM) -r $(JDK_IMAGE_DIR) 1.34 @@ -545,6 +550,7 @@ 1.35 OUTPUTDIR.desc = Output directory, default is build/<osname> 1.36 BOOTDIR.desc = JDK used to compile agent java source and test with 1.37 JDK_IMPORT_PATH.desc = Promoted JDK to copy for 'create_jdk' 1.38 +JDK_IMAGE_DIR.desc = Directory to place JDK to copy 1.39 EXPORT_PATH.desc = Directory to place files to export for JDK build 1.40 1.41 # Make variables to print out (description and value) 1.42 @@ -553,6 +559,7 @@ 1.43 OUTPUTDIR \ 1.44 BOOTDIR \ 1.45 JDK_IMPORT_PATH \ 1.46 + JDK_IMAGE_DIR \ 1.47 EXPORT_PATH 1.48 1.49 # Make variables that should refer to directories that exist