# HG changeset patch
# User asaha
# Date 1412709506 25200
# Node ID 0126ded60f134235381a2b9dd2080b91521937e4
# Parent  97f6daded37840e3ff7288af473ad0dc90f3eeb4# Parent  ff44294a2be69a548a508e336ac798b0ed28793d
Merge

diff -r 97f6daded378 -r 0126ded60f13 make/jprt.properties
--- 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},	\
diff -r 97f6daded378 -r 0126ded60f13 test/Makefile
--- 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 \