# HG changeset patch
# User weijun
# Date 1297743075 -28800
# Node ID 587947f960366250bc2e5976bc3143545d2b3015
# Parent  29afb3ec47e28a9709fadb738dcb540d6abdf26a
7018928: test failure: sun/security/krb5/auto/SSL.java
Reviewed-by: valeriep

diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/BadKdc1.java
--- a/jdk/test/sun/security/krb5/auto/BadKdc1.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/BadKdc1.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6843127
- * @run main/timeout=300 BadKdc1
+ * @run main/othervm/timeout=300 BadKdc1
  * @summary krb5 should not try to access unavailable kdc too often
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/BadKdc2.java
--- a/jdk/test/sun/security/krb5/auto/BadKdc2.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/BadKdc2.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6843127
- * @run main/timeout=300 BadKdc2
+ * @run main/othervm/timeout=300 BadKdc2
  * @summary krb5 should not try to access unavailable kdc too often
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/BadKdc3.java
--- a/jdk/test/sun/security/krb5/auto/BadKdc3.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/BadKdc3.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6843127
- * @run main/timeout=300 BadKdc3
+ * @run main/othervm/timeout=300 BadKdc3
  * @summary krb5 should not try to access unavailable kdc too often
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/BadKdc4.java
--- a/jdk/test/sun/security/krb5/auto/BadKdc4.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/BadKdc4.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6843127
- * @run main/timeout=300 BadKdc4
+ * @run main/othervm/timeout=300 BadKdc4
  * @summary krb5 should not try to access unavailable kdc too often
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/CleanState.java
--- a/jdk/test/sun/security/krb5/auto/CleanState.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/CleanState.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6716534
+ * @run main/othervm CleanState
  * @summary Krb5LoginModule has not cleaned temp info between authentication attempts
  */
 import com.sun.security.auth.module.Krb5LoginModule;
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/CrossRealm.java
--- a/jdk/test/sun/security/krb5/auto/CrossRealm.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/CrossRealm.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6706974
+ * @run main/othervm CrossRealm
  * @summary Add krb5 test infrastructure
  */
 import java.io.File;
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
--- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6578647 6829283
+ * @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
  */
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java
--- a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6851973
+ * @run main/othervm IgnoreChannelBinding
  * @summary ignore incoming channel binding if acceptor does not set one
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/KerberosHashEqualsTest.java
--- a/jdk/test/sun/security/krb5/auto/KerberosHashEqualsTest.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/KerberosHashEqualsTest.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4641821
+ * @run main/othervm KerberosHashEqualsTest
  * @summary hashCode() and equals() for KerberosKey and KerberosTicket
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java
--- a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6857802
+ * @run main/othervm LifeTimeInSeconds
  * @summary GSS getRemainingInitLifetime method returns milliseconds not seconds
  */
 import org.ietf.jgss.GSSCredential;
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/LoginModuleOptions.java
--- a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6765491
+ * @run main/othervm LoginModuleOptions
  * @summary Krb5LoginModule a little too restrictive, and the doc is not clear.
  */
 import com.sun.security.auth.module.Krb5LoginModule;
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/MaxRetries.java
--- a/jdk/test/sun/security/krb5/auto/MaxRetries.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/MaxRetries.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6844193
- * @run main/timeout=300 MaxRetries
+ * @run main/othervm/timeout=300 MaxRetries
  * @summary support max_retries in krb5.conf
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/MoreKvno.java
--- a/jdk/test/sun/security/krb5/auto/MoreKvno.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/MoreKvno.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6893158
  * @bug 6907425
+ * @run main/othervm MoreKvno
  * @summary AP_REQ check should use key version number
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/NewSalt.java
--- a/jdk/test/sun/security/krb5/auto/NewSalt.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/NewSalt.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 6960894
  * @summary Better AS-REQ creation and processing
- * @run main NewSalt
+ * @run main/othervm NewSalt
  * @run main/othervm -Dnopreauth NewSalt
  * @run main/othervm -Donlyonepreauth NewSalt
  */
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/NonMutualSpnego.java
--- a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6733095
+ * @run main/othervm NonMutualSpnego
  * @summary Failure when SPNEGO request non-Mutual
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/SSL.java
--- a/jdk/test/sun/security/krb5/auto/SSL.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/SSL.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,16 @@
  * @test
  * @bug 6894643 6913636
  * @summary Test JSSE Kerberos ciphersuite
- * @run main SSL TLS_KRB5_WITH_RC4_128_SHA
- * @run main SSL TLS_KRB5_WITH_RC4_128_MD5
- * @run main SSL TLS_KRB5_WITH_3DES_EDE_CBC_SHA
- * @run main SSL TLS_KRB5_WITH_3DES_EDE_CBC_MD5
- * @run main SSL TLS_KRB5_WITH_DES_CBC_SHA
- * @run main SSL TLS_KRB5_WITH_DES_CBC_MD5
- * @run main SSL TLS_KRB5_EXPORT_WITH_RC4_40_SHA
- * @run main SSL TLS_KRB5_EXPORT_WITH_RC4_40_MD5
- * @run main SSL TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA
- * @run main SSL TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5
+ * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA
+ * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_MD5
+ * @run main/othervm SSL TLS_KRB5_WITH_3DES_EDE_CBC_SHA
+ * @run main/othervm SSL TLS_KRB5_WITH_3DES_EDE_CBC_MD5
+ * @run main/othervm SSL TLS_KRB5_WITH_DES_CBC_SHA
+ * @run main/othervm SSL TLS_KRB5_WITH_DES_CBC_MD5
+ * @run main/othervm SSL TLS_KRB5_EXPORT_WITH_RC4_40_SHA
+ * @run main/othervm SSL TLS_KRB5_EXPORT_WITH_RC4_40_MD5
+ * @run main/othervm SSL TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA
+ * @run main/othervm SSL TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5
  */
 import java.io.*;
 import java.net.InetAddress;
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java
--- a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6815182
+ * @run main/othervm SpnegoReqFlags
  * @summary GSSAPI/SPNEGO does not work with server using MIT Kerberos library
  */
 
diff -r 29afb3ec47e2 -r 587947f96036 jdk/test/sun/security/krb5/auto/Test5653.java
--- a/jdk/test/sun/security/krb5/auto/Test5653.java	Mon Feb 14 13:31:13 2011 -0800
+++ b/jdk/test/sun/security/krb5/auto/Test5653.java	Tue Feb 15 12:11:15 2011 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 6895424
+ * @run main/othervm Test5653
  * @summary RFC 5653
  */