diff options
Diffstat (limited to 'java/openjdk6/files/patch-test')
| -rw-r--r-- | java/openjdk6/files/patch-test | 63 |
1 files changed, 26 insertions, 37 deletions
diff --git a/java/openjdk6/files/patch-test b/java/openjdk6/files/patch-test index 0824417df8ec..b82367dc2a3a 100644 --- a/java/openjdk6/files/patch-test +++ b/java/openjdk6/files/patch-test @@ -1,5 +1,5 @@ ---- jdk/test/TestEnv.java 2012-05-01 17:18:38.000000000 -0400 -+++ jdk/test/TestEnv.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/TestEnv.java ++++ jdk/test/TestEnv.java @@ -65,14 +65,14 @@ // Reachable host with the following services running: // - echo service (port 7) @@ -18,8 +18,8 @@ // Hostname that cannot be resolved by named service { "unresovable_host", "blah-blah.blah-blah.blah" }, ---- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2012-09-26 19:05:45.000000000 -0400 -+++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh ++++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh @@ -72,6 +72,16 @@ done } @@ -46,8 +46,8 @@ runOne GetTotalSwapSpaceSize $total_swap ;; * ) ---- jdk/test/java/io/File/GetXSpace.java 2012-05-01 17:18:41.000000000 -0400 -+++ jdk/test/java/io/File/GetXSpace.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/io/File/GetXSpace.java ++++ jdk/test/java/io/File/GetXSpace.java @@ -49,7 +49,7 @@ private static final String name = System.getProperty("os.name"); private static final String dfFormat; @@ -57,8 +57,8 @@ // FileSystem Total Used Available Use% MountedOn dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)"; } else if (name.startsWith("Windows")) { ---- jdk/test/java/lang/ProcessBuilder/Basic.java 2012-05-01 17:18:42.000000000 -0400 -+++ jdk/test/java/lang/ProcessBuilder/Basic.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/lang/ProcessBuilder/Basic.java ++++ jdk/test/java/lang/ProcessBuilder/Basic.java @@ -1096,7 +1096,7 @@ String[] cmdp = childArgs.toArray(new String[childArgs.size()]); String[] envp = {"=ExitValue=3", "=C:=\\"}; @@ -68,8 +68,8 @@ equal(commandOutput(p), expected); if (Windows.is()) { ProcessBuilder pb = new ProcessBuilder(childArgs); ---- jdk/test/java/lang/ProcessBuilder/Zombies.java 2012-05-01 17:18:42.000000000 -0400 -+++ jdk/test/java/lang/ProcessBuilder/Zombies.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/lang/ProcessBuilder/Zombies.java ++++ jdk/test/java/lang/ProcessBuilder/Zombies.java @@ -49,11 +49,11 @@ } catch (IOException _) {/* OK */} @@ -84,8 +84,8 @@ // Count all the zombies that are children of this Java process final String[] zombieCounter = { ---- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java 2012-05-01 17:18:43.000000000 -0400 -+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java ++++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java @@ -79,7 +79,7 @@ System.out.println("Test passed."); } @@ -95,8 +95,8 @@ private static void checkLoadAvg() throws Exception { // Obtain load average from OS command ProcessBuilder pb = new ProcessBuilder("/usr/bin/uptime"); ---- jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java 2012-05-01 17:18:44.000000000 -0400 -+++ jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java ++++ jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java @@ -79,7 +79,7 @@ * on Windows, too. */ @@ -106,8 +106,8 @@ File[] fds = dirOfFD.listFiles(); if (fds != null) ---- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2012-05-01 17:18:45.000000000 -0400 -+++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java ++++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java @@ -40,7 +40,7 @@ InetAddress bogus = InetAddress.getByName("0.0.0.0"); SocketChannel sc = SocketChannel.open(); @@ -117,8 +117,8 @@ //Test1: connect only sc.connect(saddr); ---- jdk/test/java/nio/channels/SocketChannel/Shutdown.java 2012-05-01 17:18:45.000000000 -0400 -+++ jdk/test/java/nio/channels/SocketChannel/Shutdown.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/nio/channels/SocketChannel/Shutdown.java ++++ jdk/test/java/nio/channels/SocketChannel/Shutdown.java @@ -35,7 +35,7 @@ public static void main(String args[]) throws Exception { @@ -128,8 +128,8 @@ SocketChannel sc = SocketChannel.open(sa); boolean before = sc.socket().isInputShutdown(); sc.socket().shutdownInput(); ---- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-05-01 17:18:45.000000000 -0400 -+++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c ++++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c @@ -135,7 +135,7 @@ } close(thisFd); @@ -139,8 +139,8 @@ _exit(-1); } ---- jdk/test/java/nio/charset/Charset/default.sh 2012-09-26 19:05:46.000000000 -0400 -+++ jdk/test/java/nio/charset/Charset/default.sh 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/java/nio/charset/Charset/default.sh ++++ jdk/test/java/nio/charset/Charset/default.sh @@ -76,22 +76,20 @@ } @@ -174,8 +174,8 @@ + go ja_JP.eucJP x-eucjp-open + go ja_JP.PCK x-PCK fi ---- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2012-09-26 19:05:47.000000000 -0400 -+++ jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh ++++ jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh @@ -33,7 +33,7 @@ # The host that we try to resolve @@ -185,8 +185,8 @@ # fail gracefully if DNS is not configured or there # isn't a CNAME record. ---- jdk/test/tools/pack200/MemoryAllocatorTest.java 2012-05-01 17:18:53.000000000 -0400 -+++ jdk/test/tools/pack200/MemoryAllocatorTest.java 2012-09-26 19:07:59.000000000 -0400 +--- jdk/test/tools/pack200/MemoryAllocatorTest.java ++++ jdk/test/tools/pack200/MemoryAllocatorTest.java @@ -81,6 +81,7 @@ static final boolean debug = Boolean.getBoolean("MemoryAllocatorTest.Debug"); @@ -204,14 +204,3 @@ System.out.println("Warning: Windows/Linux 64bit tests passes vacuously"); return; } ---- jdk/test/tools/pack200/Pack200Simple.sh 2012-09-26 19:05:49.000000000 -0400 -+++ jdk/test/tools/pack200/Pack200Simple.sh 2012-09-26 19:07:59.000000000 -0400 -@@ -134,7 +134,7 @@ - # A quick crc compare test to ensure a well formed zip - # archive, this is a critical unpack200 behaviour. - -- unzip -t $jfName > ${jfName}.unzip.log 2>&1 -+ ${LOCALBASE}/bin/unzip -t $jfName > ${jfName}.unzip.log 2>&1 - if [ $? != 0 ]; then - errorOut "$jfName unzip -t test failed" - fi |