changeset 12991:60c79b649a56

Merge
author duke
date Wed, 05 Jul 2017 18:14:07 +0200
parents 8ff1c75f204a 07ad352154a8
children b6e3fc4faffb
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Tue Jun 26 10:27:11 2012 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:14:07 2017 +0200
@@ -165,3 +165,4 @@
 1a8c7c530f8a9b7f5bdb9b0693b2f5435ca5205e jdk8-b41
 1ce5dc16416611c58b7480ca67a2eee5153498a6 jdk8-b42
 661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43
+e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44
--- a/test/Makefile	Tue Jun 26 10:27:11 2012 -0700
+++ b/test/Makefile	Wed Jul 05 18:14:07 2017 +0200
@@ -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)