changeset 570:0988b03c15f5

Merge
author asaha
date Mon, 09 Jul 2012 12:04:06 -0700
parents d67284ca5b81 56291720b5e5
children c8b99b12a277
files .hgtags
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 28 11:52:10 2012 -0700
+++ b/.hgtags	Mon Jul 09 12:04:06 2012 -0700
@@ -189,4 +189,7 @@
 9b9a6d318e8aa5b8f0e42d2d3d2c0c34cb3f986d jdk7u6-b13
 eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14
 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
+7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
+b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
+9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
 5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u7-b01
--- a/make/jprt.properties	Thu Jun 28 11:52:10 2012 -0700
+++ b/make/jprt.properties	Mon Jul 09 12:04:06 2012 -0700
@@ -91,6 +91,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools2},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_jfr},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_misc}
 
 # All vm test targets (testset=all)
--- a/test/Makefile	Thu Jun 28 11:52:10 2012 -0700
+++ b/test/Makefile	Mon Jul 09 12:04:06 2012 -0700
@@ -66,6 +66,7 @@
 	jdk_sound  \
 	jdk_text  \
 	jdk_tools1 jdk_tools2  \
+	jdk_jfr \
 	jdk_util
 
 # These tests need a DISPLAY and can create window interaction complications