# HG changeset patch
# User lana
# Date 1339182065 25200
# Node ID 6aea9b1a384032edb3a2a720eb5e02d04ae8ee35
# Parent  dac58047c19ff3aa23c7824aa1e7e3da27a07231# Parent  df998cd4d51d259813a2ce82dfcae734dbf72fd3
Merge

diff -r dac58047c19f -r 6aea9b1a3840 make/jprt.properties
--- a/make/jprt.properties	Thu Jun 07 12:10:12 2012 -0700
+++ b/make/jprt.properties	Fri Jun 08 12:01: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)