# HG changeset patch
# User lana
# Date 1340917745 25200
# Node ID b7c1b441d131c70278de299b5d1e59dce0755dc5
# Parent  f8e56a1133762b68d7788f710b14204936f97434# Parent  1145cdaefc86c3edd18bad36ad5187fc5c74ae1f
Merge

diff -r f8e56a113376 -r b7c1b441d131 make/jprt.properties
--- a/make/jprt.properties	Wed Jun 27 17:18:51 2012 -0700
+++ b/make/jprt.properties	Thu Jun 28 14:09:05 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)
diff -r f8e56a113376 -r b7c1b441d131 test/Makefile
--- a/test/Makefile	Wed Jun 27 17:18:51 2012 -0700
+++ b/test/Makefile	Thu Jun 28 14:09:05 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