From 0aed0c29f6eda943c16a1dbf39f0ff5c82db8e10 Mon Sep 17 00:00:00 2001
From: alanb <unknown>
Date: Tue, 9 Oct 2012 13:25:27 +0100
Subject: [PATCH] 7173494: some jdk tests are not run in test/Makefile
 Reviewed-by: chegar, mchung, mduigou, iris

---
 make/jprt.properties | 14 ++++++--------
 test/Makefile        | 10 ++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/jprt.properties b/make/jprt.properties
index 2b044f0..984c2b1 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -79,20 +79,18 @@ jprt.make.rule.core.test.targets=                               \
     ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
     ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio1},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio2},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_nio3},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_nio},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
     ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
-    ${jprt.my.test.target.set:TESTNAME=jdk_management1},        \
-    ${jprt.my.test.target.set:TESTNAME=jdk_management2},        \
+    ${jprt.my.test.target.set:TESTNAME=jdk_management},         \
+    ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
     ${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_tools},              \
+    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
-    ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+    ${jprt.my.test.target.set:TESTNAME=jdk_other}
 
 # All vm test targets (testset=all)
 jprt.vm.all.test.targets=    					\
diff --git a/test/Makefile b/test/Makefile
index f1dfe1d..9e4d509 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -58,9 +58,9 @@ JDK_DEFAULT_TEST_LIST = \
 	jdk_io  \
 	jdk_lang  \
 	jdk_math  \
-	jdk_misc  \
+	jdk_other  \
 	jdk_net  \
-	jdk_nio1 jdk_nio2 jdk_nio3  \
+	jdk_nio \
 	jdk_security1 \
 	jdk_text  \
 	jdk_util
@@ -69,12 +69,14 @@ JDK_DEFAULT_TEST_LIST = \
 JDK_NONDEFAULT_TEST_LIST = \
 	jdk_awt \
 	jdk_beans2 jdk_beans3  \
-	jdk_management1 jdk_management2  \
+	jdk_management \
+	jdk_jmx \
 	jdk_security2 jdk_security3  \
 	jdk_rmi \
 	jdk_sound \
 	jdk_swing \
-	jdk_tools1 jdk_tools2 \
+	jdk_tools \
+	jdk_jdi \
 	jdk_jfr
 
 # All jdk tests
-- 
GitLab