# HG changeset patch
# User lana
# Date 1340685429 25200
# Node ID 633f2378c904c92bb922a6e19e9f62fe8eac14af
# Parent  1e989139ce0d8ec44189a2b7b556a69585d71c37# Parent  67e1fb3b2b3319e299f4f8626c6a3558f8f92811
Merge

diff -r 1e989139ce0d -r 633f2378c904 test/Makefile
--- 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)