--- a/hotspot/test/Makefile Sat Dec 06 04:30:00 2014 +0000
+++ b/hotspot/test/Makefile Mon Dec 08 00:15:55 2014 -0800
@@ -26,6 +26,10 @@
# Makefile to run various hotspot tests
#
+ALT_MAKE ?= closed
+
+-include $(ALT_MAKE)/Makefile
+
GETMIXEDPATH=echo
# Utilities used
@@ -308,14 +312,27 @@
PHONY_LIST += jtreg_tests
+# flags used to execute java in test targets
+TEST_FLAGS += -version -Xinternalversion -X -help
+
+sanitytest: prep $(PRODUCT_HOME)
+ @for flag in $(TEST_FLAGS); \
+ do \
+ echo Executing java $(JAVA_OPTIONS) $$flag; \
+ $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) $$flag; \
+ res=$$?; \
+ if [ $$res -ne 0 ]; then \
+ exit $$res; \
+ fi; \
+ done
+
+PHONY_LIST += sanitytest
+
################################################################
# clienttest (make sure various basic java client options work)
-hotspot_clienttest clienttest: prep $(PRODUCT_HOME)
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
+hotspot_clienttest clienttest: sanitytest
$(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes.jsa
$(RM) $(PRODUCT_HOME)/jre/bin/client/classes.jsa
$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -Xshare:dump
@@ -326,10 +343,7 @@
# minimaltest (make sure various basic java minimal options work)
-hotspot_minimaltest minimaltest: prep $(PRODUCT_HOME)
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
+hotspot_minimaltest minimaltest: sanitytest
PHONY_LIST += hotspot_minimaltest minimaltest
@@ -337,10 +351,7 @@
# servertest (make sure various basic java server options work)
-hotspot_servertest servertest: prep $(PRODUCT_HOME)
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -version
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -help
- $(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -X
+hotspot_servertest servertest: sanitytest
PHONY_LIST += hotspot_servertest servertest