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
