changeset 1232:0126ded60f13

Merge
author asaha
date Tue, 07 Oct 2014 12:18:26 -0700
parents 97f6daded378 ff44294a2be6
children 4093bbbc9000
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Wed Sep 10 15:36:59 2014 -0700
+++ b/make/jprt.properties	Tue Oct 07 12:18:26 2014 -0700
@@ -83,6 +83,7 @@
     ${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_security4},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_management},	\
     ${jprt.my.test.target.set:TESTNAME=jdk_jmx},	\
--- a/test/Makefile	Wed Sep 10 15:36:59 2014 -0700
+++ b/test/Makefile	Tue Oct 07 12:18:26 2014 -0700
@@ -63,7 +63,7 @@
 	jdk_other  \
 	jdk_net  \
 	jdk_nio \
-	jdk_security1 jdk_security2 jdk_security3  \
+	jdk_security1 jdk_security2 jdk_security3 jdk_security4  \
 	jdk_sound  \
 	jdk_text  \
 	jdk_tools \