changeset 8056:056ef4238bb4

8057813: Alterations to jdk_security3 test target Reviewed-by: mullan
author coffeys
date Fri, 19 Sep 2014 17:49:42 +0100
parents 6b53b16c1641
children 9ac8a27d7d19
files make/jprt.properties test/Makefile
diffstat 2 files changed, 25 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Wed Sep 17 23:52:27 2014 +0400
+++ b/make/jprt.properties	Fri Sep 19 17:49:42 2014 +0100
@@ -81,6 +81,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 17 23:52:27 2014 +0400
+++ b/test/Makefile	Fri Sep 19 17:49:42 2014 +0100
@@ -550,21 +550,41 @@
 # Stable othervm testruns (minus items from PROBLEM_LIST)
 #   Using samevm has serious problems with these tests
 JDK_ALL_TARGETS += jdk_security2
-jdk_security2: $(call TestDirs, javax/crypto com/sun/crypto)
+jdk_security2: $(call TestDirs, javax/crypto com/sun/crypto javax/xml/crypto)
 	$(call RunAgentvmBatch)
 
 # Stable othervm testruns (minus items from PROBLEM_LIST)
 #   Using samevm has serious problems with these tests
 JDK_ALL_TARGETS += jdk_security3
-jdk_security3: $(call TestDirs, com/sun/security lib/security \
-		javax/security sun/security \
+jdk_security3: $(call TestDirs, com/sun/security/auth \
+		com/sun/security/sasl lib/security \
+		javax/security/sasl javax/security/auth/login \
+		javax/security/auth/PrivateCredentialPermission \
+		javax/security/auth/Subject \
+		javax/security/auth/SubjectDomainCombiner \
+		javax/security/auth/x500 sun/security/acl \
+		sun/security/action sun/security/ec sun/security/mscapi \
+		sun/security/pkcs sun/security/pkcs11 sun/security/pkcs12 \
+		sun/security/provider sun/security/rsa sun/security/ssl \
+		sun/security/smartcardio sun/security/tools \
+		sun/security/util sun/security/validator sun/security/x509 \
 		com/sun/org/apache/xml/internal/security \
 		com/oracle/security)
 	$(call SharedLibraryPermissions,sun/security)
 	$(call RunAgentvmBatch)
 
+# Stable othervm testruns (minus items from PROBLEM_LIST)
+#   Using samevm has serious problems with these tests
+JDK_ALL_TARGETS += jdk_security4
+jdk_security4: $(call TestDirs, com/sun/security/jgss \
+		javax/security/auth/kerberos \
+		sun/security/krb5 \
+		sun/security/jgss)
+	$(call SharedLibraryPermissions,sun/security)
+	$(call RunAgentvmBatch)
+
 # All security tests
-jdk_security: jdk_security1 jdk_security2 jdk_security3
+jdk_security: jdk_security1 jdk_security2 jdk_security3 jdk_security4
 	@$(SummaryInfo)
 
 # Stable samevm testruns (minus items from PROBLEM_LIST)