changeset 495:67e1fb3b2b33

Merge
author lana
date Sun, 17 Jun 2012 21:27:22 -0700
parents 1af3996aa431 (diff) 02c6c67c1bb7 (current diff)
children 633f2378c904
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Thu Jun 14 13:13:53 2012 -0700
+++ b/test/Makefile	Sun Jun 17 21:27:22 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)