# HG changeset patch
# User andrew
# Date 1341913156 -3600
# Node ID 0e7b94bd450d4270d4e9bd6c040c94fa4be714a6
# Parent  7f5ea73378dff309294980a730a27bd7b12d672e# Parent  9c41f7b1460b106d18676899d24b6ea07de5a369
Merge jdk7u6-b18

diff -r 7f5ea73378df -r 0e7b94bd450d .hgtags
--- a/.hgtags	Fri Jun 29 15:19:51 2012 +0100
+++ b/.hgtags	Tue Jul 10 10:39:16 2012 +0100
@@ -196,3 +196,4 @@
 eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14
 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
+b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
diff -r 7f5ea73378df -r 0e7b94bd450d make/jprt.properties
--- a/make/jprt.properties	Fri Jun 29 15:19:51 2012 +0100
+++ b/make/jprt.properties	Tue Jul 10 10:39:16 2012 +0100
@@ -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)
diff -r 7f5ea73378df -r 0e7b94bd450d test/Makefile
--- a/test/Makefile	Fri Jun 29 15:19:51 2012 +0100
+++ b/test/Makefile	Tue Jul 10 10:39:16 2012 +0100
@@ -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