--- old/test/ProblemList.txt Sun Mar 11 17:46:30 2012 +++ new/test/ProblemList.txt Sun Mar 11 17:46:29 2012 @@ -212,7 +212,7 @@ # 7076644 java/io/File/Basic.java windows-all -# Test needs AWT window server, does not work headless +# 7145435 - Test needs AWT window server, does not work headless java/io/Serializable/resolveClass/deserializeButton/run.sh macosx-all ############################################################################ @@ -225,9 +225,6 @@ # 7052549 java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all -# 6963118 -java/nio/channels/Selector/Wakeup.java windows-all - # 7133499, 7133497 java/nio/channels/AsyncCloseAndInterrupt.java macosx-all java/nio/channels/AsynchronousFileChannel/Lock.java macosx-all @@ -259,9 +256,6 @@ # jdk_security -# 7145024 -sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java solaris-all - # 7147060 com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all @@ -305,9 +299,6 @@ # 7079203 sun/security/tools/keytool/printssl.sh fails on solaris with timeout sun/security/tools/keytool/printssl.sh solaris-all -# 7081817 -sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java generic-all - # 7041639, Solaris DSA keypair generation bug (Note: jdk_util also affected) java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all sun/security/tools/jarsigner/onlymanifest.sh solaris-all --- old/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java Sun Mar 11 17:46:32 2012 +++ new/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java Sun Mar 11 17:46:31 2012 @@ -22,7 +22,6 @@ */ /* @test - * @clean A B Container ReplacerObjectOutputStream * @summary Verify that ClassCastException is thrown when deserializing * an object and one of its object fields is incompatibly replaced * by either replaceObject/resolveObject. --- old/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java Sun Mar 11 17:46:34 2012 +++ new/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java Sun Mar 11 17:46:33 2012 @@ -22,7 +22,6 @@ */ /* @test - * @clean A SubstituteObjectOutputStream SubstituteObjectInputStream * @bug 4099013 * @summary Enable substitution of String and Array by ObjectStreams. */ --- old/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java Sun Mar 11 17:46:36 2012 +++ new/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java Sun Mar 11 17:46:35 2012 @@ -23,7 +23,6 @@ /* @test * @bug 4065313 - * @clean A ReplaceWithNull MyObjectOutputStream * @summary Ensure that it is okay to replace an object with null. */ import java.io.*; --- old/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java Sun Mar 11 17:46:38 2012 +++ new/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java Sun Mar 11 17:46:38 2012 @@ -22,7 +22,6 @@ */ /* @test - * @clean A * @bug 4146453 * @summary Test that regrow of object/handle table of ObjectOutputStream works. */ --- old/test/java/nio/file/Files/CustomOptions.java Sun Mar 11 17:46:40 2012 +++ new/test/java/nio/file/Files/CustomOptions.java Sun Mar 11 17:46:40 2012 @@ -28,6 +28,7 @@ * @author Brandon Passanisi * @library .. * @build CustomOptions PassThroughFileSystem + * @run main CustomOptions */ import java.io.IOException; --- old/test/java/text/Bidi/Bug6850113.java Sun Mar 11 17:46:43 2012 +++ new/test/java/text/Bidi/Bug6850113.java Sun Mar 11 17:46:42 2012 @@ -25,6 +25,7 @@ * @bug 6850113 * @summary Verify the return value of digit() for some digits. * @compile -XDignore.symbol.file=true Bug6850113.java + * @run main Bug6850113 */ import sun.text.normalizer.UCharacter; --- old/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java Sun Mar 11 17:46:45 2012 +++ new/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java Sun Mar 11 17:46:44 2012 @@ -26,6 +26,7 @@ * @bug 4241676 * @summary getContinuationDirContext() should set CPE environment property. * @build DummyObjectFactory DummyContext + * @run main GetContDirCtx */ import java.util.Hashtable; --- old/test/sun/misc/Cleaner/exitOnThrow.sh Sun Mar 11 17:46:47 2012 +++ new/test/sun/misc/Cleaner/exitOnThrow.sh Sun Mar 11 17:46:46 2012 @@ -29,6 +29,7 @@ # @summary Ensure that if a cleaner throws an exception then the VM exits # # @build ExitOnThrow +# @run shell exitOnThrow.sh # Command-line usage: sh exitOnThrow.sh /path/to/build --- old/test/sun/nio/cs/OLD/TestIBMDB.java Sun Mar 11 17:46:49 2012 +++ new/test/sun/nio/cs/OLD/TestIBMDB.java Sun Mar 11 17:46:48 2012 @@ -26,6 +26,7 @@ * @bug 6843578 * @summary Test IBM DB charsets * @build IBM930_OLD IBM933_OLD IBM935_OLD IBM937_OLD IBM939_OLD IBM942_OLD IBM943_OLD IBM948_OLD IBM949_OLD IBM950_OLD IBM970_OLD IBM942C_OLD IBM943C_OLD IBM949C_OLD IBM1381_OLD IBM1383_OLD EUC_CN_OLD EUC_KR_OLD GBK_OLD Johab_OLD MS932_OLD MS936_OLD MS949_OLD MS950_OLD + * @run main TestIBMDB */ import java.nio.charset.*; --- old/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java Sun Mar 11 17:46:51 2012 +++ new/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java Sun Mar 11 17:46:50 2012 @@ -27,6 +27,7 @@ * @compile JavaxSSLContextImpl.java ComSSLContextImpl.java * JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java * JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java + * @run main ProviderTest * @summary brokenness in the com.sun.net.ssl.SSLSecurity wrappers */ --- old/test/java/io/File/isDirectory/Applet.html Sun Mar 11 17:46:53 2012 +++ /dev/null Sun Mar 11 17:46:53 2012 @@ -1,2 +0,0 @@ - - --- old/test/sun/nio/cs/OLD/TestX11CS.java Sun Mar 11 17:46:54 2012 +++ /dev/null Sun Mar 11 17:46:54 2012 @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2009, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 1234567 - * @summary Test updated X11 charsets - * @build X11GB2312_OLD X11GBK_OLD X11KSC5601_OLD - */ - -import java.nio.charset.*; -import java.nio.*; -import java.util.*; - -public class TestX11CS { - - static char[] decode(byte[] bb, Charset cs) - throws Exception { - CharsetDecoder dec = cs.newDecoder(); - ByteBuffer bbf = ByteBuffer.wrap(bb); - CharBuffer cbf = CharBuffer.allocate(bb.length); - CoderResult cr = dec.decode(bbf, cbf, true); - if (cr != CoderResult.UNDERFLOW) { - System.out.println("DEC-----------------"); - int pos = bbf.position(); - System.out.printf(" cr=%s, bbf.pos=%d, bb[pos]=%x,%x,%x,%x%n", - cr.toString(), pos, - bb[pos++]&0xff, bb[pos++]&0xff,bb[pos++]&0xff, bb[pos++]&0xff); - throw new RuntimeException("Decoding err: " + cs.name()); - } - char[] cc = new char[cbf.position()]; - cbf.flip(); cbf.get(cc); - return cc; - - } - - static byte[] encode(char[] cc, Charset cs) - throws Exception { - ByteBuffer bbf = ByteBuffer.allocate(cc.length * 4); - CharBuffer cbf = CharBuffer.wrap(cc); - CharsetEncoder enc = cs.newEncoder(); - - CoderResult cr = enc.encode(cbf, bbf, true); - if (cr != CoderResult.UNDERFLOW) { - System.out.println("ENC-----------------"); - int pos = cbf.position(); - System.out.printf(" cr=%s, cbf.pos=%d, cc[pos]=%x%n", - cr.toString(), pos, cc[pos]&0xffff); - throw new RuntimeException("Encoding err: " + cs.name()); - } - byte[] bb = new byte[bbf.position()]; - bbf.flip(); bbf.get(bb); - return bb; - } - - static char[] getChars(Charset newCS, Charset oldCS) { - CharsetEncoder enc = oldCS.newEncoder(); - CharsetEncoder encNew = newCS.newEncoder(); - char[] cc = new char[0x10000]; - int pos = 0; - int i = 0; - while (i < 0x10000) { - if (enc.canEncode((char)i) != encNew.canEncode((char)i)) { - System.out.printf(" Err i=%x%n", i); - //throw new RuntimeException("canEncode() err!"); - } - if (enc.canEncode((char)i)) { - cc[pos++] = (char)i; - } - i++; - } - return Arrays.copyOf(cc, pos); - } - - static void compare(Charset newCS, Charset oldCS) throws Exception { - System.out.printf(" Diff <%s> <%s>...%n", newCS.name(), oldCS.name()); - char[] cc = getChars(newCS, oldCS); - - byte[] bb1 = encode(cc, newCS); - byte[] bb2 = encode(cc, oldCS); - - if (!Arrays.equals(bb1, bb2)) { - System.out.printf(" encoding failed!%n"); - } - char[] cc1 = decode(bb1, newCS); - char[] cc2 = decode(bb1, oldCS); - if (!Arrays.equals(cc1, cc2)) { - for (int i = 0; i < cc1.length; i++) { - if (cc1[i] != cc2[i]) { - System.out.printf("i=%d, cc1=%x cc2=%x, bb=<%x%x>%n", - i, - cc1[i]&0xffff, cc2[i]&0xffff, - bb1[i*2]&0xff, bb1[i*2+1]&0xff); - } - - } - - System.out.printf(" decoding failed%n"); - } - } - - public static void main(String[] args) throws Exception { - compare(new sun.awt.motif.X11GBK(), - new X11GBK_OLD()); - - compare(new sun.awt.motif.X11GB2312(), - new X11GB2312_OLD()); - - compare(new sun.awt.motif.X11KSC5601(), - new X11KSC5601_OLD()); - - } -}