--- a/hotspot/make/jprt.properties	Fri May 08 10:34:31 2009 -0700
+++ b/hotspot/make/jprt.properties	Fri May 08 15:16:38 2009 -0700
@@ -335,7 +335,19 @@
 
 # The default test/Makefile targets that should be run
 
-# Example:
-#   jprt.make.rule.test.targets=*-*-*-packtest
 #jprt.make.rule.test.targets=*-product-*-packtest
 
+jprt.make.rule.test.targets = \
+  ${jprt.my.solaris.sparc}-*-c1-clienttest, \
+  ${jprt.my.solaris.i586}-*-c1-clienttest, \
+  ${jprt.my.linux.i586}-*-c1-clienttest, \
+  ${jprt.my.windows.i586}-*-c1-clienttest, \
+  ${jprt.my.solaris.sparc}-*-c2-servertest, \
+  ${jprt.my.solaris.sparcv9}-*-c2-servertest, \
+  ${jprt.my.solaris.i586}-*-c2-servertest, \
+  ${jprt.my.solaris.x64}-*-c2-servertest, \
+  ${jprt.my.linux.i586}-*-c2-servertest, \
+  ${jprt.my.linux.x64}-*-c2-servertest, \
+  ${jprt.my.windows.i586}-*-c2-servertest, \
+  ${jprt.my.windows.x64}-*-c2-servertest
+

--- a/hotspot/test/Makefile	Fri May 08 10:34:31 2009 -0700
+++ b/hotspot/test/Makefile	Fri May 08 15:16:38 2009 -0700
@@ -172,6 +172,33 @@
 
 ################################################################
 
+# clienttest (make sure various basic java client options work)
+
+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
+	$(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes.jsa
+	$(RM) $(PRODUCT_HOME)/jre/lib/*/client/classes_g.jsa
+	$(RM) $(PRODUCT_HOME)/jre/bin/client/classes.jsa
+	$(RM) $(PRODUCT_HOME)/jre/bin/client/classes_g.jsa
+	$(PRODUCT_HOME)/bin/java $(JAVA_OPTIONS) -Xshare:dump
+
+PHONY_LIST += clienttest
+
+################################################################
+
+# servertest (make sure various basic java server options work)
+
+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
+
+PHONY_LIST += servertest
+
+################################################################
+
 # packtest
 
 # Expect JPRT to set JPRT_PACKTEST_HOME.