Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9892:ff51e99d392b
8033271: Manual security tests have @ignore rather than @run main/manual
Reviewed-by: mbalao
Contributed-by: rajan.halade@oracle.com
line wrap: on
line diff
--- a/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,12 +24,9 @@ /* * @test * @bug 0000000 - * @ignore run main/timeout=900 PerformanceTest - * @summary PerformanceTest + * @summary This test checks performance of various ciphers. * @author Jan Luehe - * - * ignore since this test exists for performance - * purpose and can be run separately if needed. + * @run main/manual PerformanceTest */ import java.security.*; import java.security.spec.*;
--- a/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, 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,8 +25,7 @@ * @test * @bug 4470717 * @summary fix default handling and other misc - * - * @ignore run these by hand + * @run main/manual Default */ import com.sun.security.auth.callback.TextCallbackHandler;
--- a/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 6825240 * @summary Password.readPassword() echos the input when System.Console is null - * @ignore run these by hand + * @run main/manual Password */ import com.sun.security.auth.callback.TextCallbackHandler;
--- a/test/com/sun/security/sasl/gsskerb/AuthOnly.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/security/sasl/gsskerb/AuthOnly.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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,11 +25,14 @@ * @test * @bug 4634892 * @summary Ensure authentication via GSS-API/Kerberos v5 works. - * @ignore see runwjaas.csh for instructions for how to run this test + * @run main/manual AuthOnly */ + /* - * Can set logging to FINEST to view exchange. + * Set logging to FINEST to view exchange. + * See runwjaas.csh for instructions for how to run this test. */ + import javax.security.sasl.*; import javax.security.auth.callback.*; import java.security.*;
--- a/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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,12 +25,15 @@ * @test * @bug 5014493 * @summary SaslServer.wrap throws NullPointerException when security - * layer negotiated - * @ignore see run-conf-wjaas.csh for instructions for how to run this test + * layer negotiated. + * @run main/manual ConfSecurityLayer */ + /* - * Can set logging to FINEST to view exchange. + * Set logging to FINEST to view exchange. + * See run-conf-wjaas.csh for instructions for how to run this test. */ + import javax.security.sasl.*; import javax.security.auth.callback.*; import java.security.*;
--- a/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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,13 +24,16 @@ /* * @test * @bug 4873552 - * @summary GSS-API/krb5 SASL mechanism should throw IllegalStateException for auth-only - - * @ignore see run-nosec-wjaas.csh for instructions for how to run this test + * @summary GSS-API/krb5 SASL mechanism should throw IllegalStateException + * for auth-only + * @run main/manual NoSecurityLayer */ + /* - * Can set logging to FINEST to view exchange. + * Set logging to FINEST to view exchange. + * See run-nosec-wjaas.csh for instructions for how to run this test. */ + import javax.security.sasl.*; import javax.security.auth.callback.*; import java.security.*;
--- a/test/java/security/Policy/Root/Root.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/java/security/Policy/Root/Root.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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,12 +25,13 @@ * * @bug 4619757 * @summary User Policy Setting is not recognized on Netscape 6 - * when invoked as root - * @ignore - must run test as root - * - * place Root.policy in the root home directory (/), as /.java.policy - * run this test as root: - * java Root + * when invoked as root. + * @run main/manual Root + */ + +/* + * Place Root.policy in the root home directory (/), + * as /.java.policy and run as test as root user. */ import java.security.*;
--- a/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2014, 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,11 @@ * @test * @bug 4641821 * @summary hashCode() and equals() for KerberosKey and KerberosTicket - * @ignore Must set up KDC and setup Kerberos configuration file + * @run main/manual KerberosHashEqualsTest + */ + +/* + * Must setup KDC and Kerberos configuration file */ import java.net.InetAddress;
--- a/test/javax/security/auth/kerberos/KerberosTixDateTest.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/javax/security/auth/kerberos/KerberosTixDateTest.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2014, 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 @@ -26,7 +26,11 @@ * @bug 6659990 8147772 * @summary test the immutability of the Date fields in KerberosTicket class, * serialization, and behavior after being destroyed. - * @ignore Must set up KDC and setup Kerberos configuration file + * @run main/manual KerberosTixDateTest + */ + +/* + * Must setup KDC and Kerberos configuration file */ import java.lang.reflect.InvocationTargetException;
--- a/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -26,10 +26,13 @@ * @bug 6313675 6323647 8028192 * @summary Verify that all ciphersuites work in FIPS mode * @library .. - * @ignore JSSE supported cipher suites are changed with CR 6916074, - * need to update this test case in JDK 7 soon - * @run main/othervm ClientJSSEServerJSSE * @author Andreas Sterbenz + * @run main/manual ClientJSSEServerJSSE + */ + +/* + * JSSE supported cipher suites are changed with CR 6916074, + * need to update this test case in JDK 7 soon */ import java.security.*;
--- a/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, 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 @@ -23,8 +23,7 @@ /* * @test - * @bug 4231980 - * @bug 4233913 + * @bug 4231980 4233913 * @summary Make sure that when no system policy and user policy files exist, * the built-in default policy will be used, which - amongst other things - * grants standard extensions the AllPermission. This regression is for 2 @@ -34,7 +33,7 @@ * * @build SomeExtensionClass * @build GrantAllPermToExtWhenNoPolicy - * @ignore shell GrantAllPermToExtWhenNoPolicy.sh + * @run shell/manual GrantAllPermToExtWhenNoPolicy.sh */ import java.security.*;
--- a/test/sun/security/provider/PolicyParser/ExtDirs.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/provider/PolicyParser/ExtDirs.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, 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 @@ -26,13 +26,16 @@ * @bug 4215035 * @summary standard extensions path is hard-coded in default * system policy file - * @ignore run this by hand - * - * java -Djava.security.manager \ - * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ - * -Djava.security.policy==./ExtDirs.policy \ - * -Djava.security.debug=parser \ - * ExtDirs + * @run main/manual ExtDirs + */ + +/* + * Run this test manually with: + * java -Djava.security.manager \ + * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ + * -Djava.security.policy==./ExtDirs.policy \ + * -Djava.security.debug=parser \ + * ExtDirs */ public class ExtDirs {
--- a/test/sun/security/provider/PolicyParser/ExtDirsChange.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/provider/PolicyParser/ExtDirsChange.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -26,16 +26,19 @@ * @bug 4993819 * @summary standard extensions path is hard-coded in default * system policy file - * @ignore run this by hand - * - * javac ExtDirChange - * rm ExtDirsA*.class ExtDirsB*.class - * java -Djava.security.manager \ - * -Dtest.src=. \ - * -Djava.security.policy=ExtDirsChange.policy \ - * -Djava.security.debug=parser \ - * -cp ExtDirsA/a.jar:ExtDirsB/b.jar:. \ - * ExtDirsChange + * @run main/manual ExtDirsChange + */ + +/* + * Run this test manually with: + * javac ExtDirChange + * rm ExtDirsA*.class ExtDirsB*.class + * java -Djava.security.manager \ + * -Dtest.src=. \ + * -Djava.security.policy=ExtDirsChange.policy \ + * -Djava.security.debug=parser \ + * -cp ExtDirsA/a.jar:ExtDirsB/b.jar:. \ + * ExtDirsChange */ import java.io.File;
--- a/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -26,22 +26,25 @@ * @bug 4993819 * @summary standard extensions path is hard-coded in default * system policy file - * @ignore run this by hand - * - * java -Djava.security.manager \ - * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ - * -Djava.security.debug=parser \ - * ExtDirsDefaultPolicy + * @run main/manual ExtDirsDefaultPolicy + */ + +/* + * Run this test manually with: + * java -Djava.security.manager \ + * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ + * -Djava.security.debug=parser \ + * ExtDirsDefaultPolicy * * To test other varients of the ${{java.ext.dirs}} protocol, remove * the grant statement for java.ext.dirs in $JAVA_HOME/lib/security/java.policy * and then run against the 3 different policy files. * - * java -Djava.security.manager \ - * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ - * -Djava.security.debug=parser \ - * -Djava.security.policy=ExtDirs{1,2,3}.policy \ - * ExtDirsDefaultPolicy + * java -Djava.security.manager \ + * -Djava.ext.dirs=./ExtDirsA:./ExtDirsB \ + * -Djava.security.debug=parser \ + * -Djava.security.policy=ExtDirs{1,2,3}.policy \ + * ExtDirsDefaultPolicy */ public class ExtDirsDefaultPolicy {
--- a/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, 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,56 +25,54 @@ * @test * @bug 4373996 * @summary parser incorrectly ignores a principal if the principal name - * expands to nothing. this test is a bit complicated. - * - * 1) PrincipalExpansionError.java - * the test itself. this test creates a Subject with a - * SolarisPrincipal("TestPrincipal") and calls doAs - * with a PrincipalExpansionErrorAction. - * - * 2) PrincipalExpansionErrorAction - * this action tries to read the file, /testfile + * expands to nothing. + * @run main/manual PrincipalExpansionError + */ + +/* + * This test is a bit complicated. + * 1) PrincipalExpansionError.java + * the test itself. this test creates a Subject with a + * SolarisPrincipal("TestPrincipal") and calls doAs + * with a PrincipalExpansionErrorAction. + * 2) PrincipalExpansionErrorAction + * this action tries to read the file, /testfile + * 3) to run the test: + * a) jtreg -verbose:all -testjdk:<your_jdk>/build/sparc + * PrincipalExpansionError.java + * b) PrincipalExpansionError is compiled and put into + * the "test.classes" directory + * c) PrincipalExpansionErrorAction is compiled and put into + * the "test.classes"/apackage directory + * (since it belongs to the 'apackage' package + * d) the PrincipalExpansionError shell script moves + * test.classes/apackage to test.src/apackage. + * this guarantees that the test will run + * with codebase test.classes, and the action + * will run with codebase test.src. + * e) the test is executed. permissions to read the file, + * /testfile, were granted to the PrincipalExpansionError. + * the policy entry for PrincipalExpansionErrorAction + * running as SolarisPrincipal("TestPrincipal") + * was also granted the file permission, + * but it has a bogus second SolarisPrincipal with + * a name that can't be property-expanded. * - * 3) to run the test: - * a) jtreg -verbose:all -testjdk:<your_jdk>/build/sparc - * PrincipalExpansionError.java - * b) PrincipalExpansionError is compiled and put into - * the "test.classes" directory - * c) PrincipalExpansionErrorAction is compiled and put into - * the "test.classes"/apackage directory - * (since it belongs to the 'apackage' package - * d) the PrincipalExpansionError shell script moves - * test.classes/apackage to test.src/apackage. - * this guarantees that the test will run - * with codebase test.classes, and the action - * will run with codebase test.src. - * e) the test is executed. permissions to read the file, - * /testfile, were granted to the PrincipalExpansionError. - * the policy entry for PrincipalExpansionErrorAction - * running as SolarisPrincipal("TestPrincipal") - * was also granted the file permission, - * but it has a bogus second SolarisPrincipal with - * a name that can't be property-expanded. - * - * the old behavior of the code would ignore the - * bogus entry and incorrectly grants the file permission - * to SolarisPrincipal("TestPrincipal"). - * the new behavior correctly ignores the entire - * policy entry. - * Please note that the jtreg needs to be granted - * allpermissions for this test to succeed. If the codebase - * for jtreg changes, the PrincipalExpansionError.policy - * needs to be updated. - * - * f) original @ tags: - * compile PrincipalExpansionErrorAction.java - * run shell PrincipalExpansionError.sh - * run main/othervm/policy=PrincipalExpansionError.policy - * -Djava.security.debug=access,domain,failure - * PrincipalExpansionError - * - * @ignore unable to rely on location or javatest.jar - * (so we can grant it AllPermission) + * the old behavior of the code would ignore the + * bogus entry and incorrectly grants the file permission + * to SolarisPrincipal("TestPrincipal"). + * the new behavior correctly ignores the entire + * policy entry. + * Please note that the jtreg needs to be granted + * allpermissions for this test to succeed. If the codebase + * for jtreg changes, the PrincipalExpansionError.policy + * needs to be updated. + * f) original @ tags: + * compile PrincipalExpansionErrorAction.java + * run shell PrincipalExpansionError.sh + * run main/othervm/policy=PrincipalExpansionError.policy + * -Djava.security.debug=access,domain,failure + * PrincipalExpansionError */ import javax.security.auth.*;
--- a/test/sun/security/smartcardio/TestChannel.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestChannel.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6239117 * @summary test logical channels work * @author Andreas Sterbenz - * @ignore requires special hardware - * @run main/manual TestExclusive + * @run main/manual TestChannel */ +// This test requires special hardware. + import javax.smartcardio.Card; import javax.smartcardio.CardChannel; import javax.smartcardio.CardTerminal;
--- a/test/sun/security/smartcardio/TestConnect.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestConnect.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6293769 6294527 6309280 * @summary test connect() works * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestConnect */ +// This test requires special hardware. + import java.util.List; import javax.smartcardio.TerminalFactory; import javax.smartcardio.Card;
--- a/test/sun/security/smartcardio/TestConnectAgain.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestConnectAgain.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6239117 * @summary test connect works correctly if called multiple times/card removed * @author Andreas Sterbenz - * @ignore requires special hardware - * @run main/manual TestTransmit + * @run main/manual TestConnectAgain */ +// This test requires special hardware. + import javax.smartcardio.Card; import javax.smartcardio.CardException; import javax.smartcardio.CardChannel;
--- a/test/sun/security/smartcardio/TestControl.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestControl.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6239117 6470320 * @summary test if transmitControlCommand() works * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestControl */ +// This test requires special hardware. + import javax.smartcardio.Card; import javax.smartcardio.CardException; import javax.smartcardio.CardTerminal;
--- a/test/sun/security/smartcardio/TestDefault.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestDefault.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6327047 * @summary verify that TerminalFactory.getDefault() works * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestDefault */ +// This test requires special hardware. + import java.util.List; import javax.smartcardio.CardTerminal; import javax.smartcardio.TerminalFactory;
--- a/test/sun/security/smartcardio/TestExclusive.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestExclusive.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6239117 * @summary verify that beginExclusive()/endExclusive() works * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestExclusive */ +// This test requires special hardware. + import javax.smartcardio.Card; import javax.smartcardio.CardChannel; import javax.smartcardio.CardException;
--- a/test/sun/security/smartcardio/TestMultiplePresent.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestMultiplePresent.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6239117 6445367 * @summary test that CardTerminals.waitForCard() works * @author Andreas Sterbenz - * @ignore requires special hardware - * @run main/manual TestPresent + * @run main/manual TestMultiplePresent */ +// This test requires special hardware. + import java.util.List; import javax.smartcardio.CardTerminal; import javax.smartcardio.CardTerminals;
--- a/test/sun/security/smartcardio/TestPresent.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestPresent.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6293769 6294527 * @summary test that the isCardPresent()/waitForX() APIs work correctly * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestPresent */ +// This test requires special hardware. + import java.util.List; import javax.smartcardio.CardTerminal; import javax.smartcardio.TerminalFactory;
--- a/test/sun/security/smartcardio/TestTransmit.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/smartcardio/TestTransmit.java Mon Feb 03 02:52:09 2020 +0000 @@ -26,10 +26,11 @@ * @bug 6293769 6294527 * @summary test transmit() works * @author Andreas Sterbenz - * @ignore requires special hardware * @run main/manual TestTransmit */ +// This test requires special hardware. + import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.FileReader;
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -21,19 +21,20 @@ * questions. */ -// -// SunJSSE does not support dynamic system properties, no way to re-use -// system properties in samevm/agentvm mode. -// - /* * @test * @bug 4717766 + * @author Brad Wetmore * @summary 1.0.3 JsseX509TrustManager erroneously calls isClientTrusted() - * @run main/othervm ClientServer - * @ignore JSSE supports algorithm constraints with CR 6916074, - * need to update this test case in JDK 7 soon - * @author Brad Wetmore + * @run main/manual ClientServer + */ + +/* + * SunJSSE does not support dynamic system properties, no way to re-use + * system properties in samevm/agentvm mode. + * + * JSSE supports algorithm constraints with CR 6916074, need to update + * this test case in JDK 7 soon. * * This problem didn't exist in JSSE 1.4, only JSSE 1.0.3. However, * this is a useful test, so I decided to include it in 1.4.2.
--- a/test/sun/security/tools/keytool/console.sh Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/tools/keytool/console.sh Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, 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,8 +25,6 @@ # @bug 6418647 8005527 # @summary Doc bug 5035358 shows sun.security.util.Password.readPassword() is buggy. # @author Weijun Wang -# @ignore unable to test manual tools that have input from stdin, -# and output to stderr and stdout # @run shell/manual console.sh if [ "$ALT_PASS" = "" ]; then
--- a/test/sun/security/tools/keytool/i18n.sh Mon Feb 03 02:26:31 2020 +0000 +++ b/test/sun/security/tools/keytool/i18n.sh Mon Feb 03 02:52:09 2020 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2014, 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,9 +25,7 @@ # @bug 4348369 7083664 # @summary keytool not i18n compliant # @author charlie lai -# -# @ignore unable to test manual tools that have input from stdin, -# and output to stderr and stdout +# @run shell/manual i18n.sh # set a few environment variables so that the shell-script can run stand-alone # in the source directory