changeset 549:b7c1b441d131 jdk7u6-b17

Merge
author lana
date Thu, 28 Jun 2012 14:09:05 -0700
parents f8e56a113376 1145cdaefc86
children 9c41f7b1460b
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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