--- a/make/jprt.properties Fri Apr 17 14:37:00 2015 -0700
+++ b/make/jprt.properties Mon Apr 20 14:26:53 2015 +0200
@@ -48,6 +48,9 @@
# Use configure when building
jprt.build.use.configure=true
+# Set up the run flavors (jvm variants)
+jprt.run.flavors=c1,c2,default,${my.additional.run.flavors}
+
# Set make target to use for different build flavors
jprt.build.flavor.debugOpen.target=jprt_bundle
jprt.build.flavor.fastdebug.target=jprt_bundle
@@ -410,19 +413,15 @@
# Make file based test targets
-my.make.rule.test.targets.hotspot.clienttests= \
- linux_i586_2.6-*-c1-hotspot_clienttest, \
- windows_i586_6.1-*-c1-hotspot_clienttest
-
-my.make.rule.test.targets.hotspot.servertests= \
- solaris_sparcv9_5.11-*-c2-hotspot_servertest, \
- solaris_x64_5.11-*-c2-hotspot_servertest, \
- linux_i586_2.6-*-c2-hotspot_servertest, \
- linux_x64_2.6-*-c2-hotspot_servertest, \
- macosx_x64_10.9-*-c2-hotspot_servertest, \
- windows_i586_6.1-*-c2-hotspot_servertest, \
- windows_x64_6.1-*-c2-hotspot_servertest
-
+my.make.rule.test.targets.hotspot.basicvmtests= \
+ linux_i586_2.6-*-default-hotspot_basicvmtest, \
+ linux_x64_2.6-*-default-hotspot_basicvmtest, \
+ macosx_x64_10.9-*-default-hotspot_basicvmtest, \
+ solaris_sparcv9_5.11-*-default-hotspot_basicvmtest, \
+ solaris_x64_5.11-*-default-hotspot_basicvmtest, \
+ windows_i586_6.1-*-default-hotspot_basicvmtest, \
+ windows_x64_6.1-*-default-hotspot_basicvmtest
+
my.make.rule.test.targets.hotspot.internalvmtests= \
solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \
solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \
@@ -461,8 +460,7 @@
# Other Makefile based Hotspot tests
my.make.rule.test.targets.hotspot.other= \
- ${my.make.rule.test.targets.hotspot.clienttests}, \
- ${my.make.rule.test.targets.hotspot.servertests}, \
+ ${my.make.rule.test.targets.hotspot.basicvmtests}, \
${my.make.rule.test.targets.hotspot.internalvmtests}, \
${my.additional.make.rule.test.targets.hotspot.other}