changeset 1189:3e6d3c8810ee jdk8u40-b12

Merge
author amurillo
date Tue, 28 Oct 2014 10:10:36 -0700
parents 89d06f82edb7 17c3f2ab0139
children 9f996a9338b8
files
diffstat 1 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Wed Oct 22 12:28:55 2014 -0700
+++ b/make/jprt.properties	Tue Oct 28 10:10:36 2014 -0700
@@ -467,19 +467,23 @@
   windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests,		\
   windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
 
-my.make.rule.test.targets.hotspot.wbapitests=				\
-  solaris_sparcv9_5.10-{product|fastdebug}-c2-hotspot_wbapitest,	\
-  solaris_x64_5.10-{product|fastdebug}-c2-hotspot_wbapitest,		\
-  linux_i586_2.6-{product|fastdebug}-c2-hotspot_wbapitest,		\
-  linux_x64_2.6-{product|fastdebug}-c2-hotspot_wbapitest,		\
-  windows_i586_6.1-{product|fastdebug}-c2-hotspot_wbapitest,		\
-  windows_x64_6.1-{product|fastdebug}-c2-hotspot_wbapitest,		\
-  linux_i586_2.6-{product|fastdebug}-c1-hotspot_wbapitest,		\
-  windows_i586_6.1-{product|fastdebug}-c1-hotspot_wbapitest
+my.make.rule.test.targets.hotspot.reg.group=				\
+  solaris_sparcv9_5.10-{product|fastdebug}-c2-GROUP,            	\
+  solaris_x64_5.10-{product|fastdebug}-c2-GROUP,		        \
+  linux_i586_2.6-{product|fastdebug}-c2-GROUP,				\
+  linux_x64_2.6-{product|fastdebug}-c2-GROUP,				\
+  windows_i586_6.1-{product|fastdebug}-c2-GROUP,			\
+  windows_x64_6.1-{product|fastdebug}-c2-GROUP,				\
+  linux_i586_2.6-{product|fastdebug}-c1-GROUP,				\
+  windows_i586_6.1-{product|fastdebug}-c1-GROUP
 
 my.make.rule.test.targets.hotspot=					\
   ${my.make.rule.test.targets.hotspot.clienttests},			\
   ${my.make.rule.test.targets.hotspot.servertests},			\
   ${my.make.rule.test.targets.hotspot.internalvmtests},			\
-  ${my.make.rule.test.targets.hotspot.wbapitests},			\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc},		\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime},		\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability},	\
   ${my.additional.make.rule.test.targets.hotspot}