changeset 12304:47d6ef0dd448

8130112: Create a common TEST.properties for @modules in test/sun/security/krb5/auto Reviewed-by: alanb
author weijun
date Thu, 02 Jul 2015 16:20:43 +0800
parents 44ed891c5e74
children 566f17d49786
files test/sun/security/krb5/auto/AcceptPermissions.java test/sun/security/krb5/auto/AcceptorSubKey.java test/sun/security/krb5/auto/AddressesAndNameType.java test/sun/security/krb5/auto/BadKdc1.java test/sun/security/krb5/auto/BadKdc2.java test/sun/security/krb5/auto/BadKdc3.java test/sun/security/krb5/auto/BadKdc4.java test/sun/security/krb5/auto/Basic.java test/sun/security/krb5/auto/BasicKrb5Test.java test/sun/security/krb5/auto/BasicProc.java test/sun/security/krb5/auto/CleanState.java test/sun/security/krb5/auto/CrossRealm.java test/sun/security/krb5/auto/DiffNameSameKey.java test/sun/security/krb5/auto/DupEtypes.java test/sun/security/krb5/auto/DynamicKeytab.java test/sun/security/krb5/auto/EmptyPassword.java test/sun/security/krb5/auto/FileKeyTab.java test/sun/security/krb5/auto/ForwardableCheck.java test/sun/security/krb5/auto/GSS.java test/sun/security/krb5/auto/GSSUnbound.java test/sun/security/krb5/auto/HttpNegotiateServer.java test/sun/security/krb5/auto/IgnoreChannelBinding.java test/sun/security/krb5/auto/KPEquals.java test/sun/security/krb5/auto/KeyPermissions.java test/sun/security/krb5/auto/KeyTabCompat.java test/sun/security/krb5/auto/KvnoNA.java test/sun/security/krb5/auto/LifeTimeInSeconds.java test/sun/security/krb5/auto/LoginModuleOptions.java test/sun/security/krb5/auto/LoginNoPass.java test/sun/security/krb5/auto/MSOID2.java test/sun/security/krb5/auto/MaxRetries.java test/sun/security/krb5/auto/MoreKvno.java test/sun/security/krb5/auto/NewInquireTypes.java test/sun/security/krb5/auto/NewSalt.java test/sun/security/krb5/auto/NoAddresses.java test/sun/security/krb5/auto/NoInitNoKeytab.java test/sun/security/krb5/auto/NonMutualSpnego.java test/sun/security/krb5/auto/NoneReplayCacheTest.java test/sun/security/krb5/auto/OkAsDelegate.java test/sun/security/krb5/auto/OkAsDelegateXRealm.java test/sun/security/krb5/auto/OnlyDesLogin.java test/sun/security/krb5/auto/PrincipalNameEquals.java test/sun/security/krb5/auto/RRC.java test/sun/security/krb5/auto/Renewal.java test/sun/security/krb5/auto/ReplayCacheExpunge.java test/sun/security/krb5/auto/ReplayCachePrecise.java test/sun/security/krb5/auto/ReplayCacheTest.java test/sun/security/krb5/auto/ReplayCacheTestProc.java test/sun/security/krb5/auto/S4U2proxy.java test/sun/security/krb5/auto/S4U2proxyGSS.java test/sun/security/krb5/auto/S4U2self.java test/sun/security/krb5/auto/S4U2selfAsServer.java test/sun/security/krb5/auto/S4U2selfAsServerGSS.java test/sun/security/krb5/auto/S4U2selfGSS.java test/sun/security/krb5/auto/SPNEGO.java test/sun/security/krb5/auto/SSL.java test/sun/security/krb5/auto/SaslBasic.java test/sun/security/krb5/auto/SaslGSS.java test/sun/security/krb5/auto/SaslUnbound.java test/sun/security/krb5/auto/SpnegoLifeTime.java test/sun/security/krb5/auto/SpnegoReqFlags.java test/sun/security/krb5/auto/TEST.properties test/sun/security/krb5/auto/TcpTimeout.java test/sun/security/krb5/auto/Test5653.java test/sun/security/krb5/auto/TwoOrThree.java test/sun/security/krb5/auto/TwoPrinces.java test/sun/security/krb5/auto/TwoTab.java test/sun/security/krb5/auto/UdpTcp.java test/sun/security/krb5/auto/UnboundService.java test/sun/security/krb5/auto/Unreachable.java test/sun/security/krb5/auto/UseCacheAndStoreKey.java test/sun/security/krb5/auto/W83.java test/sun/security/krb5/tools/KtabZero.java
diffstat 73 files changed, 14 insertions(+), 553 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/security/krb5/auto/AcceptPermissions.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/AcceptPermissions.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 9999999
  * @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file AcceptPermissions.java
  * @run main/othervm AcceptPermissions two
  * @run main/othervm AcceptPermissions unbound
--- a/test/sun/security/krb5/auto/AcceptorSubKey.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/AcceptorSubKey.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7077646
  * @summary gssapi wrap for CFX per-message tokens always set FLAG_ACCEPTOR_SUBKEY
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file AcceptorSubKey.java
  * @run main/othervm AcceptorSubKey 0
  * @run main/othervm AcceptorSubKey 4
--- a/test/sun/security/krb5/auto/AddressesAndNameType.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/AddressesAndNameType.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 4501327 4868379 8039132
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm AddressesAndNameType 1
  * @run main/othervm AddressesAndNameType 2
  * @run main/othervm AddressesAndNameType 3
--- a/test/sun/security/krb5/auto/BadKdc1.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BadKdc1.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm/timeout=300 BadKdc1
  * @summary krb5 should not try to access unavailable kdc too often
  */
@@ -64,4 +57,3 @@
        );
    }
 }
-
--- a/test/sun/security/krb5/auto/BadKdc2.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BadKdc2.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm/timeout=300 BadKdc2
  * @summary krb5 should not try to access unavailable kdc too often
  */
--- a/test/sun/security/krb5/auto/BadKdc3.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BadKdc3.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm/timeout=300 BadKdc3
  * @summary krb5 should not try to access unavailable kdc too often
  */
--- a/test/sun/security/krb5/auto/BadKdc4.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BadKdc4.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6843127
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm/timeout=300 BadKdc4
  * @summary krb5 should not try to access unavailable kdc too often
  */
--- a/test/sun/security/krb5/auto/Basic.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/Basic.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7152176
  * @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file Basic.java
  * @run main/othervm Basic
  */
--- a/test/sun/security/krb5/auto/BasicKrb5Test.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BasicKrb5Test.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6706974
  * @summary Add krb5 test infrastructure
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file BasicKrb5Test.java
  * @run main/othervm BasicKrb5Test
  * @run main/othervm BasicKrb5Test des-cbc-crc
--- a/test/sun/security/krb5/auto/BasicProc.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/BasicProc.java	Thu Jul 02 16:20:43 2015 +0800
@@ -26,13 +26,6 @@
  * @bug 8009977
  * @summary A test library to launch multiple Java processes
  * @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file BasicProc.java
  * @run main/othervm BasicProc
  */
--- a/test/sun/security/krb5/auto/CleanState.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/CleanState.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6716534
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file CleanState.java
  * @run main/othervm CleanState
  * @summary Krb5LoginModule has not cleaned temp info between authentication attempts
--- a/test/sun/security/krb5/auto/CrossRealm.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/CrossRealm.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6706974
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file CrossRealm.java
  * @run main/othervm CrossRealm
  * @summary Add krb5 test infrastructure
--- a/test/sun/security/krb5/auto/DiffNameSameKey.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/DiffNameSameKey.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8005447
  * @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file DiffNameSameKey.java
  * @run main/othervm/fail DiffNameSameKey a
  * @run main/othervm DiffNameSameKey b
--- a/test/sun/security/krb5/auto/DupEtypes.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/DupEtypes.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7067974
  * @summary multiple ETYPE-INFO-ENTRY with same etype and different salt
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file DupEtypes.java
  * @run main/othervm DupEtypes 1
  * @run main/othervm DupEtypes 2
--- a/test/sun/security/krb5/auto/DynamicKeytab.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/DynamicKeytab.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6894072
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file DynamicKeytab.java
  * @run main/othervm DynamicKeytab
  * @summary always refresh keytab
--- a/test/sun/security/krb5/auto/EmptyPassword.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/EmptyPassword.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,13 +25,6 @@
  * @test
  * @bug 6879540
  * @summary enable empty password for kerberos 5
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file EmptyPassword.java
  * @run main/othervm EmptyPassword
  */
--- a/test/sun/security/krb5/auto/FileKeyTab.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/FileKeyTab.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,13 +25,6 @@
  * @test
  * @bug 7152121
  * @summary Krb5LoginModule no longer handles keyTabNames with "file:" prefix
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file FileKeyTab.java
  * @run main/othervm FileKeyTab
  */
--- a/test/sun/security/krb5/auto/ForwardableCheck.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/ForwardableCheck.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8022582
  * @summary Relax response flags checking in sun.security.krb5.KrbKdcRep.check.
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file ForwardableCheck.java
  * @run main/othervm ForwardableCheck
  */
--- a/test/sun/security/krb5/auto/GSS.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/GSS.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7152176
  * @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file GSS.java
  * @run main/othervm GSS
  */
--- a/test/sun/security/krb5/auto/GSSUnbound.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/GSSUnbound.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8001104
  * @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file GSSUnbound.java
  * @run main/othervm GSSUnbound
  */
--- a/test/sun/security/krb5/auto/HttpNegotiateServer.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/HttpNegotiateServer.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,15 +24,6 @@
 /*
  * @test
  * @bug 6578647 6829283
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.base/sun.util.logging
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm HttpNegotiateServer
  * @summary Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication()
  * @summary HTTP/Negotiate: Authenticator triggered again when user cancels the first one
@@ -77,9 +68,6 @@
 import sun.security.jgss.GSSUtil;
 import sun.security.krb5.Config;
 import java.util.Base64;
-import sun.util.logging.PlatformLogger;
-
-import java.util.Base64;
 
 /**
  * Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each
@@ -172,9 +160,7 @@
     public static void main(String[] args)
             throws Exception {
 
-        String HTTPLOG = "sun.net.www.protocol.http.HttpURLConnection";
         System.setProperty("sun.security.krb5.debug", "true");
-        PlatformLogger.getLogger(HTTPLOG).setLevel(PlatformLogger.Level.ALL);
 
         KDC kdcw = KDC.create(REALM_WEB);
         kdcw.addPrincipal(WEB_USER, WEB_PASS);
--- a/test/sun/security/krb5/auto/IgnoreChannelBinding.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/IgnoreChannelBinding.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6851973
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm IgnoreChannelBinding
  * @summary ignore incoming channel binding if acceptor does not set one
  */
--- a/test/sun/security/krb5/auto/KPEquals.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/KPEquals.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8015669
  * @summary KerberosPrincipal::equals should ignore name-type
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file KPEquals.java
  * @run main/othervm KPEquals
  */
--- a/test/sun/security/krb5/auto/KeyPermissions.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/KeyPermissions.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8004488
  * @summary wrong permissions checked in krb5
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file KeyPermissions.java
  * @run main/othervm KeyPermissions
  */
--- a/test/sun/security/krb5/auto/KeyTabCompat.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/KeyTabCompat.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6894072
  * @bug 8004488
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file KeyTabCompat.java
  * @run main/othervm KeyTabCompat
  * @summary always refresh keytab
--- a/test/sun/security/krb5/auto/KvnoNA.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/KvnoNA.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 7197159
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file KvnoNA.java
  * @run main/othervm KvnoNA
  * @summary accept different kvno if there no match
--- a/test/sun/security/krb5/auto/LifeTimeInSeconds.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/LifeTimeInSeconds.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6857802
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm LifeTimeInSeconds
  * @summary GSS getRemainingInitLifetime method returns milliseconds not seconds
  */
--- a/test/sun/security/krb5/auto/LoginModuleOptions.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/LoginModuleOptions.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6765491
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm LoginModuleOptions
  * @summary Krb5LoginModule a little too restrictive, and the doc is not clear.
  */
--- a/test/sun/security/krb5/auto/LoginNoPass.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/LoginNoPass.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8028351
  * @summary JWS doesn't get authenticated when using kerberos auth proxy
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file LoginNoPass.java
  * @run main/othervm LoginNoPass
  */
--- a/test/sun/security/krb5/auto/MSOID2.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/MSOID2.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,15 +25,6 @@
  * @test
  * @bug 8078439
  * @summary SPNEGO auth fails if client proposes MS krb5 OID
- * @modules java.base/sun.misc
- *          java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file MSOID2.java
  * @run main/othervm MSOID2
  */
--- a/test/sun/security/krb5/auto/MaxRetries.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/MaxRetries.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6844193
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file MaxRetries.java
  * @run main/othervm/timeout=300 MaxRetries
  * @summary support max_retries in krb5.conf
--- a/test/sun/security/krb5/auto/MoreKvno.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/MoreKvno.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6893158 6907425 7197159
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm MoreKvno
  * @summary AP_REQ check should use key version number
  */
--- a/test/sun/security/krb5/auto/NewInquireTypes.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NewInquireTypes.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8043071
  * @summary Expose session key and KRB_CRED through extended GSS-API
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file NewInquireTypes.java
  * @run main/othervm NewInquireTypes
  */
--- a/test/sun/security/krb5/auto/NewSalt.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NewSalt.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6960894
  * @summary Better AS-REQ creation and processing
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm NewSalt
  * @run main/othervm -Dnopreauth NewSalt
  * @run main/othervm -Donlyonepreauth NewSalt
--- a/test/sun/security/krb5/auto/NoAddresses.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NoAddresses.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 7032354
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm NoAddresses 1
  * @run main/othervm NoAddresses 2
  * @run main/othervm/fail NoAddresses 3
--- a/test/sun/security/krb5/auto/NoInitNoKeytab.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NoInitNoKeytab.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7089889
  * @summary Krb5LoginModule.login() throws an exception if used without a keytab
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file NoInitNoKeytab.java
  * @run main/othervm NoInitNoKeytab
  */
--- a/test/sun/security/krb5/auto/NonMutualSpnego.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NonMutualSpnego.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6733095
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm NonMutualSpnego
  * @summary Failure when SPNEGO request non-Mutual
  */
--- a/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 8001326
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm NoneReplayCacheTest
  * @summary the replaycache type none cannot stop an authenticator replay,
  * but it can stop a message replay when s.s.k.acceptor.subkey is true.
--- a/test/sun/security/krb5/auto/OkAsDelegate.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/OkAsDelegate.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6853328 7172701
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm OkAsDelegate false true true false false false
  *      FORWARDABLE ticket not allowed, always fail
  * @run main/othervm OkAsDelegate true false false false false false
--- a/test/sun/security/krb5/auto/OkAsDelegateXRealm.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/OkAsDelegateXRealm.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6853328 7172701
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm OkAsDelegateXRealm false
  *      KDC no OK-AS-DELEGATE, fail
  * @run main/othervm -Dtest.kdc.policy.ok-as-delegate OkAsDelegateXRealm true
--- a/test/sun/security/krb5/auto/OnlyDesLogin.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/OnlyDesLogin.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,13 +25,6 @@
  * @test
  * @bug 8014310
  * @summary JAAS/Krb5LoginModule using des encytypes failure with NPE after JDK-8012679
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file OnlyDesLogin.java
  * @run main/othervm OnlyDesLogin
  */
--- a/test/sun/security/krb5/auto/PrincipalNameEquals.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/PrincipalNameEquals.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7061379
  * @summary [Kerberos] Cross-realm authentication fails, due to nameType problem
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file PrincipalNameEquals.java
  * @run main/othervm PrincipalNameEquals
  */
--- a/test/sun/security/krb5/auto/RRC.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/RRC.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7077640
  * @summary gss wrap for cfx doesn't handle rrc != 0
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file RRC.java
  * @run main/othervm RRC
  */
--- a/test/sun/security/krb5/auto/Renewal.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/Renewal.java	Thu Jul 02 16:20:43 2015 +0800
@@ -27,13 +27,6 @@
  * @summary Add kinit options and krb5.conf flags that allow users to
  *          obtain renewable tickets and specify ticket lifetimes
  * @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file Renewal.java
  * @run main/othervm Renewal
  */
--- a/test/sun/security/krb5/auto/ReplayCacheExpunge.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/ReplayCacheExpunge.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,8 +24,6 @@
 /*
  * @test
  * @bug 8001326
- * @modules java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.rcache
  * @run main/othervm ReplayCacheExpunge 16
  * @run main/othervm/fail ReplayCacheExpunge 15
  * @summary when number of expired entries minus number of good entries
--- a/test/sun/security/krb5/auto/ReplayCachePrecise.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/ReplayCachePrecise.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,9 +24,6 @@
 /*
  * @test
  * @bug 8001326
- * @modules java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.rcache
  * @run main/othervm ReplayCachePrecise
  * @summary when there are 2 two AuthTime with the same time but different hash,
  * it's not a replay.
--- a/test/sun/security/krb5/auto/ReplayCacheTest.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/ReplayCacheTest.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 7118809 8001326
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm ReplayCacheTest jvm
  * @run main/othervm ReplayCacheTest dfl
  * @summary rcache deadlock
--- a/test/sun/security/krb5/auto/ReplayCacheTestProc.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/ReplayCacheTestProc.java	Thu Jul 02 16:20:43 2015 +0800
@@ -26,16 +26,6 @@
  * @bug 7152176
  * @summary More krb5 tests
  * @library ../../../../java/security/testlibrary/
- * @modules java.base/sun.misc
- *          java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
- *          java.security.jgss/sun.security.krb5.internal.rcache
  * @compile -XDignore.symbol.file ReplayCacheTestProc.java
  * @run main/othervm/timeout=100 ReplayCacheTestProc
  */
--- a/test/sun/security/krb5/auto/S4U2proxy.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2proxy.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584 8044215
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2proxy.java
  * @run main/othervm S4U2proxy krb5
  * @run main/othervm S4U2proxy spnego
--- a/test/sun/security/krb5/auto/S4U2proxyGSS.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2proxyGSS.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2proxyGSS.java
  * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS krb5
  * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS spnego
--- a/test/sun/security/krb5/auto/S4U2self.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2self.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2self.java
  * @run main/othervm -Dsun.security.krb5.debug=false S4U2self krb5 0
  * @run main/othervm/fail -Dsun.security.krb5.debug=false S4U2self krb5 1
--- a/test/sun/security/krb5/auto/S4U2selfAsServer.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2selfAsServer.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2selfAsServer.java
  * @run main/othervm S4U2selfAsServer krb5
  * @run main/othervm S4U2selfAsServer spnego
--- a/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2selfAsServerGSS.java
  * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS krb5
  * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS spnego
--- a/test/sun/security/krb5/auto/S4U2selfGSS.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/S4U2selfGSS.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 6355584
  * @summary Introduce constrained Kerberos delegation
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file S4U2selfGSS.java
  * @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS krb5
  * @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS spnego
--- a/test/sun/security/krb5/auto/SPNEGO.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SPNEGO.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7040151
  * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file SPNEGO.java
  * @run main/othervm SPNEGO
  */
--- a/test/sun/security/krb5/auto/SSL.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SSL.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,15 +25,6 @@
  * @test
  * @bug 6894643 6913636 8005523 8025123
  * @summary Test JSSE Kerberos ciphersuite
-
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA
  * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound
  * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound sni
--- a/test/sun/security/krb5/auto/SaslBasic.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SaslBasic.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7110803
  * @summary SASL service for multiple hostnames
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
- *          java.security.sasl
  * @compile -XDignore.symbol.file SaslBasic.java
  * @run main/othervm SaslBasic bound
  * @run main/othervm SaslBasic unbound
--- a/test/sun/security/krb5/auto/SaslGSS.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SaslGSS.java	Thu Jul 02 16:20:43 2015 +0800
@@ -26,15 +26,6 @@
  * @bug 8012082 8019267
  * @summary SASL: auth-conf negotiated, but unencrypted data is accepted,
   *         reset to unencrypt
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
- *          java.security.sasl
  * @compile -XDignore.symbol.file SaslGSS.java
  * @run main/othervm SaslGSS
  */
--- a/test/sun/security/krb5/auto/SaslUnbound.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SaslUnbound.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8001104
  * @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
- *          java.security.sasl
  * @compile -XDignore.symbol.file SaslUnbound.java
  * @run main/othervm SaslUnbound 0
  * @run main/othervm/fail SaslUnbound 1
--- a/test/sun/security/krb5/auto/SpnegoLifeTime.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SpnegoLifeTime.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8000653
  * @summary SPNEGO tests fail at context.getDelegCred().getRemainingInitLifetime(mechOid)
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file SpnegoLifeTime.java
  * @run main/othervm SpnegoLifeTime
  */
--- a/test/sun/security/krb5/auto/SpnegoReqFlags.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/SpnegoReqFlags.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6815182
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm SpnegoReqFlags
  * @summary GSSAPI/SPNEGO does not work with server using MIT Kerberos library
  */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/krb5/auto/TEST.properties	Thu Jul 02 16:20:43 2015 +0800
@@ -0,0 +1,10 @@
+modules java.base/sun.misc \
+        java.base/sun.net.spi.nameservice \
+        java.base/sun.security.util \
+        java.security.jgss/sun.security.jgss \
+        java.security.jgss/sun.security.krb5 \
+        java.security.jgss/sun.security.krb5.internal \
+        java.security.jgss/sun.security.krb5.internal.ccache \
+        java.security.jgss/sun.security.krb5.internal.rcache \
+        java.security.jgss/sun.security.krb5.internal.crypto \
+        java.security.jgss/sun.security.krb5.internal.ktab
--- a/test/sun/security/krb5/auto/TcpTimeout.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/TcpTimeout.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 6952519
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file TcpTimeout.java
  * @run main/othervm TcpTimeout
  * @summary kdc_timeout is not being honoured when using TCP
--- a/test/sun/security/krb5/auto/Test5653.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/Test5653.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6895424
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm Test5653
  * @summary RFC 5653
  */
--- a/test/sun/security/krb5/auto/TwoOrThree.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/TwoOrThree.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8005447
  * @summary default principal can act as anyone
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file TwoOrThree.java
  * @run main/othervm TwoOrThree first first
  * @run main/othervm/fail TwoOrThree first second
--- a/test/sun/security/krb5/auto/TwoPrinces.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/TwoPrinces.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,14 +24,6 @@
 /*
  * @test
  * @bug 6894072
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file TwoPrinces.java
  * @run main/othervm TwoPrinces
  * @summary always refresh keytab
--- a/test/sun/security/krb5/auto/TwoTab.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/TwoTab.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 7152176
  * @summary More krb5 tests
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file TwoTab.java
  * @run main/othervm TwoTab
  */
--- a/test/sun/security/krb5/auto/UdpTcp.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/UdpTcp.java	Thu Jul 02 16:20:43 2015 +0800
@@ -24,13 +24,6 @@
 /*
  * @test
  * @bug 4966382 8039132
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm UdpTcp UDP
  * @run main/othervm UdpTcp TCP
  * @summary udp or tcp
--- a/test/sun/security/krb5/auto/UnboundService.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/UnboundService.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,14 +25,6 @@
  * @test
  * @bug 8001104
  * @summary Unbound SASL service: the GSSAPI/krb5 mech
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.jgss
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file UnboundService.java
  * @run main/othervm UnboundService null null
  * @run main/othervm UnboundService server/host.rabbit.hole null
--- a/test/sun/security/krb5/auto/Unreachable.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/Unreachable.java	Thu Jul 02 16:20:43 2015 +0800
@@ -25,7 +25,6 @@
  * @test
  * @bug 7162687
  * @summary enhance KDC server availability detection
- * @modules java.security.jgss/sun.security.krb5
  * @compile -XDignore.symbol.file Unreachable.java
  * @run main/othervm/timeout=10 Unreachable
  */
--- a/test/sun/security/krb5/auto/UseCacheAndStoreKey.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/UseCacheAndStoreKey.java	Thu Jul 02 16:20:43 2015 +0800
@@ -26,13 +26,6 @@
  * @bug 7201053
  * @summary Krb5LoginModule shows NPE when both useTicketCache and storeKey
  *          are set to true
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @compile -XDignore.symbol.file UseCacheAndStoreKey.java
  * @run main/othervm UseCacheAndStoreKey
  */
--- a/test/sun/security/krb5/auto/W83.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/auto/W83.java	Thu Jul 02 16:20:43 2015 +0800
@@ -26,13 +26,6 @@
  * @bug 6932525 6951366 6959292
  * @summary kerberos login failure on win2008 with AD set to win2000 compat mode
  * and cannot login if session key and preauth does not use the same etype
- * @modules java.base/sun.net.spi.nameservice
- *          java.base/sun.security.util
- *          java.security.jgss/sun.security.krb5
- *          java.security.jgss/sun.security.krb5.internal
- *          java.security.jgss/sun.security.krb5.internal.ccache
- *          java.security.jgss/sun.security.krb5.internal.crypto
- *          java.security.jgss/sun.security.krb5.internal.ktab
  * @run main/othervm -D6932525 W83
  * @run main/othervm -D6959292 W83
  */
--- a/test/sun/security/krb5/tools/KtabZero.java	Thu Jul 02 13:20:46 2015 +0800
+++ b/test/sun/security/krb5/tools/KtabZero.java	Thu Jul 02 16:20:43 2015 +0800
@@ -33,7 +33,9 @@
  * @test
  * @bug 8014196
  * @summary ktab creates a file with zero kt_vno
+ * @requires os.family == "windows"
  * @modules java.security.jgss/sun.security.krb5.internal.ktab
+ *          java.security.jgss/sun.security.krb5.internal.tools
  */
 public class KtabZero {
 
@@ -52,15 +54,8 @@
 
         // 2. Create with the tool
         Files.deleteIfExists(Paths.get(NAME));
-        try {
-            Class ktab = Class.forName("sun.security.krb5.internal.tools.Ktab");
-            ktab.getDeclaredMethod("main", String[].class).invoke(null,
-                    (Object)(("-k " + NAME + " -a me@HERE pass").split(" ")));
-        } catch (ClassNotFoundException cnfe) {
-            // Only Windows has ktab tool
-            System.out.println("No ktab tool here. Ignored.");
-            return;
-        }
+        sun.security.krb5.internal.tools.Ktab.main(
+            ("-k " + NAME + " -a me@HERE pass").split(" "));
         check(false);
     }