Merge
authorlana
Mon, 25 Jun 2012 21:37:09 -0700
changeset 12979 07ad352154a8
parent 12976 4e53647a5955 (current diff)
parent 12978 fb116164875e (diff)
child 12991 60c79b649a56
Merge
--- a/test/Makefile	Thu Jun 21 17:07:24 2012 -0700
+++ b/test/Makefile	Mon Jun 25 21:37:09 2012 -0700
@@ -74,7 +74,8 @@
 	jdk_rmi \
 	jdk_sound \
 	jdk_swing \
-	jdk_tools1 jdk_tools2
+	jdk_tools1 jdk_tools2 \
+	jdk_jfr
 
 # All jdk tests
 JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST)