Use fdescfs(5) and procfs(5) consistently.

4 files changed, 204 insertions, 102 deletions

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 7485625570f4..efcfcd1be366 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
diff --git a/java/openjdk6/files/alsa-enable.patch b/java/openjdk6/files/alsa-enable.patch
index 4f7201ef72bb..686f029b88dc 100644
--- a/java/openjdk6/files/alsa-enable.patch
+++ b/java/openjdk6/files/alsa-enable.patch
@@ -16,6 +16,27 @@
  ifeq ($(PLATFORM), solaris)
    ifneq ($(ARCH), amd64)
      # build with ports and direct audio
+--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c	2012-05-01 17:18:35.000000000 -0400
++++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c	2012-09-26 17:35:48.000000000 -0400
+@@ -131,6 +131,10 @@
+ 
+ void getALSAVersion(char* buffer, int len) {
+     if (!hasGottenALSAVersion) {
++#ifdef __FreeBSD__
++	// XXX We do not use ALSA drivers.  Just copy the library version.
++	strcpy(ALSAVersionString, SND_LIB_VERSION_STR);
++#else
+         // get alsa version from proc interface
+         FILE* file;
+         int curr, len, totalLen, inVersionString;
+@@ -171,6 +175,7 @@
+             // null terminate
+             ALSAVersionString[len] = 0;
+         }
++#endif
+         hasGottenALSAVersion = TRUE;
+     }
+     strncpy(buffer, ALSAVersionString, len);
 --- jdk/src/share/native/com/sun/media/sound/Platform.c	2011-01-20 18:54:37.000000000 -0500
 +++ jdk/src/share/native/com/sun/media/sound/Platform.c	2011-02-11 16:20:52.000000000 -0500
 @@ -99,5 +99,15 @@
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 73f3034e0175..29b77e0fe555 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -5837,8 +5837,28 @@
  }
  
  inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf)
---- hotspot/src/os/posix/launcher/java_md.c	2011-07-05 14:30:58.000000000 -0400
-+++ hotspot/src/os/posix/launcher/java_md.c	2011-07-07 19:17:02.000000000 -0400
+--- hotspot/src/os/bsd/vm/vmError_bsd.cpp	2012-05-01 17:15:07.000000000 -0400
++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp	2012-09-26 17:05:10.000000000 -0400
+@@ -44,7 +44,7 @@
+     jio_snprintf(p, buflen - len,
+                "\n\n"
+                "Do you want to debug the problem?\n\n"
+-               "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
++               "To debug, run 'gdb /proc/%d/file %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
+                "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
+                "Otherwise, press RETURN to abort...",
+                os::current_process_id(), os::current_process_id(),
+@@ -54,7 +54,7 @@
+ 
+     if (yes) {
+       // yes, user asked VM to launch debugger
+-      jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d",
++      jio_snprintf(buf, buflen, "gdb /proc/%d/file %d",
+                    os::current_process_id(), os::current_process_id());
+ 
+       os::fork_and_exec(buf);
+--- hotspot/src/os/posix/launcher/java_md.c	2012-05-01 17:15:07.000000000 -0400
++++ hotspot/src/os/posix/launcher/java_md.c	2012-09-26 17:49:02.000000000 -0400
 @@ -41,14 +41,21 @@
  #include "version_comp.h"
  #endif
@@ -5934,16 +5954,22 @@
      char *execname = GetExecname();
      if (execname) {
          strncpy(buf, execname, bufsize-1);
-@@ -961,7 +984,7 @@
+@@ -961,9 +984,13 @@
              }
          }
      }
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
      {
++#ifdef __FreeBSD__
++        const char* self = "/proc/curproc/file";
++#else
          const char* self = "/proc/self/exe";
++#endif
          char buf[PATH_MAX+1];
-@@ -971,7 +994,7 @@
+         int len = readlink(self, buf, PATH_MAX);
+         if (len >= 0) {
+@@ -971,7 +998,7 @@
              exec_path = JLI_StringDup(buf);
          }
      }
@@ -5952,7 +5978,7 @@
      {
          /* Not implemented */
      }
-@@ -1175,7 +1198,7 @@
+@@ -1175,7 +1202,7 @@
  
  #endif /* __sun && i586 */
  
@@ -5961,7 +5987,7 @@
  
  /*
   * A utility method for asking the CPU about itself.
-@@ -1240,7 +1263,7 @@
+@@ -1240,7 +1267,7 @@
  #endif
  }
  
@@ -5970,7 +5996,7 @@
  
  #ifdef i586
  /*
-@@ -1452,6 +1475,39 @@
+@@ -1452,6 +1479,39 @@
  
  #endif /* __linux__ && i586 */
  
@@ -6010,7 +6036,7 @@
  /* Dispatch to the platform-specific definition of "server-class" */
  jboolean
  ServerClassMachine(void) {
-@@ -1466,6 +1522,8 @@
+@@ -1466,6 +1526,8 @@
    result = solaris_i586_ServerClassMachine();
  #elif defined(__linux__) && defined(i586)
    result = linux_i586_ServerClassMachine();
@@ -6019,7 +6045,7 @@
  #else
    if (_launcher_debug) {
      printf("ServerClassMachine: returns default value of %s\n",
-@@ -1821,7 +1879,7 @@
+@@ -1821,7 +1883,7 @@
  int
  ContinueInNewThread(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
      int rslt;
@@ -13972,8 +13998,8 @@
  
  #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
  #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- jdk/src/solaris/bin/java_md.c	2011-07-05 14:36:09.000000000 -0400
-+++ jdk/src/solaris/bin/java_md.c	2011-07-07 19:17:04.000000000 -0400
+--- jdk/src/solaris/bin/java_md.c	2012-05-01 17:18:34.000000000 -0400
++++ jdk/src/solaris/bin/java_md.c	2012-09-26 17:43:09.000000000 -0400
 @@ -24,6 +24,7 @@
   */
  
@@ -14082,7 +14108,31 @@
                  "%s:"
                  "%s/lib/%s:"
                  "%s/../lib/%s",
-@@ -977,6 +1011,7 @@
+@@ -878,9 +912,13 @@
+             }
+         }
+     }
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
+     {
++#ifdef __FreeBSD__
++        const char* self = "/proc/curproc/file";
++#else
+         const char* self = "/proc/self/exe";
++#endif
+         char buf[PATH_MAX+1];
+         int len = readlink(self, buf, PATH_MAX);
+         if (len >= 0) {
+@@ -888,7 +926,7 @@
+             exec_path = JLI_StringDup(buf);
+         }
+     }
+-#else /* !__sun && !__linux */
++#else /* !__sun && !__linux && !_ALLBSD_SOURCE */
+     {
+         /* Not implemented */
+     }
+@@ -977,6 +1015,7 @@
  /* Compute physical memory by asking the OS */
  uint64_t
  physical_memory(void) {
@@ -14090,7 +14140,7 @@
    const uint64_t pages     = (uint64_t) sysconf(_SC_PHYS_PAGES);
    const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE);
    const uint64_t result    = pages * page_size;
-@@ -988,6 +1023,28 @@
+@@ -988,6 +1027,28 @@
             "  physical memory: " UINT64_FORMAT " (%.3fGB)\n",
             pages, page_size, result, result / (double) GB);
    }
@@ -14119,7 +14169,7 @@
    return result;
  }
  
-@@ -1083,7 +1140,7 @@
+@@ -1083,7 +1144,7 @@
  
  #endif /* __sun && i586 */
  
@@ -14128,7 +14178,7 @@
  
  /*
   * A utility method for asking the CPU about itself.
-@@ -1692,9 +1749,23 @@
+@@ -1692,9 +1753,23 @@
      return(borrowed_unsetenv(name));
  }
  
@@ -14153,7 +14203,7 @@
  
  static void* hSplashLib = NULL;
  
-@@ -1722,13 +1793,15 @@
+@@ -1722,13 +1797,15 @@
      return "%lld";
  }
  
@@ -14171,7 +14221,7 @@
      pthread_t tid;
      pthread_attr_t attr;
      pthread_attr_init(&attr);
-@@ -1765,13 +1838,11 @@
+@@ -1765,13 +1842,11 @@
        rslt = continuation(args);
      }
  #endif
diff --git a/java/openjdk6/files/patch-test b/java/openjdk6/files/patch-test
index b6d4490ab956..6a803ba8d970 100644
--- a/java/openjdk6/files/patch-test
+++ b/java/openjdk6/files/patch-test
@@ -1,5 +1,25 @@
---- jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	2011-02-10 12:34:40.000000000 -0500
-+++ jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	2011-02-10 12:37:00.000000000 -0500
+--- jdk/test/TestEnv.java	2012-05-01 17:18:38.000000000 -0400
++++ jdk/test/TestEnv.java	2012-09-26 19:07:59.000000000 -0400
+@@ -65,14 +65,14 @@
+         // Reachable host with the following services running:
+         // - echo service (port 7)
+         // - day time port (port 13)
+-        { "host", "javaweb.sfbay.sun.com"  },
++        { "host", "icedtea.classpath.org"  },
+ 
+         // Reachable host that refuses connections to port 80
+-        { "refusing_host", "jano1.sfbay.sun.com" },
++        { "refusing_host", "ns1.gnu.org" },
+ 
+         // Reachable host that is of sufficient hops away that a connection
+         // takes a while to be established (connect doesn't complete immediatly)
+-        { "far_host", "irejano.ireland.sun.com" },
++        { "far_host", "developer.classpath.org" },
+ 
+         // 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
 @@ -72,6 +72,16 @@
     done
  }
@@ -26,8 +46,68 @@
         runOne GetTotalSwapSpaceSize $total_swap 
         ;;
      * )
---- jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2010-01-18 12:03:26.000000000 +0100
-+++ jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2010-01-18 12:03:42.000000000 +0100
+--- 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
+@@ -49,7 +49,7 @@
+     private static final String name = System.getProperty("os.name");
+     private static final String dfFormat;
+     static {
+-        if (name.equals("SunOS") || name.equals("Linux")) {
++        if (name.equals("FreeBSD") || name.equals("SunOS") || name.equals("Linux")) {
+             // 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
+@@ -1096,7 +1096,7 @@
+             String[] cmdp = childArgs.toArray(new String[childArgs.size()]);
+             String[] envp = {"=ExitValue=3", "=C:=\\"};
+             Process p = Runtime.getRuntime().exec(cmdp, envp);
+-            String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "=C:=\\,";
++            String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "";
+             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
+@@ -49,11 +49,11 @@
+         } catch (IOException _) {/* OK */}
+ 
+         try {
+-            rt.exec("/bin/true", null, new File("no-such-dir"));
++            rt.exec("/usr/bin/true", null, new File("no-such-dir"));
+             throw new Error("expected IOException not thrown");
+         } catch (IOException _) {/* OK */}
+ 
+-        rt.exec("/bin/true").waitFor();
++        rt.exec("/usr/bin/true").waitFor();
+ 
+         // 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
+@@ -79,7 +79,7 @@
+         System.out.println("Test passed.");
+     }
+ 
+-    private static String LOAD_AVERAGE_TEXT = "load average:";
++    private static String LOAD_AVERAGE_TEXT = "load averages:";
+     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
+@@ -79,7 +79,7 @@
+      * on Windows, too.
+      */
+     private static int countOpenFD() {
+-        File dirOfFD = new File("/proc/self/fd");
++        File dirOfFD = new File("/dev/fd");
+         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
 @@ -40,7 +40,7 @@
          InetAddress bogus = InetAddress.getByName("0.0.0.0");
          SocketChannel sc = SocketChannel.open();
@@ -37,8 +117,8 @@
  
          //Test1: connect only
          sc.connect(saddr);
---- jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2010-01-18 12:04:09.000000000 +0100
-+++ jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2010-01-18 12:04:20.000000000 +0100
+--- 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
 @@ -35,7 +35,7 @@
  
      public static void main(String args[]) throws Exception {
@@ -48,8 +128,28 @@
          SocketChannel sc = SocketChannel.open(sa);
          boolean before = sc.socket().isInputShutdown();
          sc.socket().shutdownInput();
---- jdk/test/java/nio/charset/Charset/default.sh	2011-03-01 14:11:37.000000000 -0500
-+++ jdk/test/java/nio/charset/Charset/default.sh	2011-03-01 18:57:04.000000000 -0500
+--- 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
+@@ -123,7 +123,7 @@
+ 
+     /*
+      * We need to close all file descriptors except for serviceFd. To
+-     * get the list of open file descriptos we read through /proc/self/fd
++     * get the list of open file descriptos we read through /dev/fd
+      * but to open this requires a file descriptor. We could use a specific
+      * file descriptor and fdopendir but Linux doesn't seem to support
+      * fdopendir. Instead we use opendir and make an assumption on the
+@@ -135,7 +135,7 @@
+     }
+     close(thisFd);
+ 
+-    if ((dp = opendir("/proc/self/fd")) == NULL) {
++    if ((dp = opendir("/dev/fd")) == NULL) {
+         _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
 @@ -76,22 +76,20 @@
  
  }
@@ -83,8 +183,8 @@
 +  go  ja_JP.eucJP    x-eucjp-open
 +  go  ja_JP.PCK      x-PCK
  fi
---- jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2010-01-18 12:04:54.000000000 +0100
-+++ jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2010-01-18 12:05:15.000000000 +0100
+--- 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
 @@ -33,7 +33,7 @@
  
  # The host that we try to resolve
@@ -94,39 +194,8 @@
  
  # fail gracefully if DNS is not configured or there 
  # isn't a CNAME record.
---- jdk/test/TestEnv.java	2010-01-18 12:05:45.000000000 +0100
-+++ jdk/test/TestEnv.java	2010-01-18 12:06:40.000000000 +0100
-@@ -65,14 +65,14 @@
-         // Reachable host with the following services running:
-         // - echo service (port 7)
-         // - day time port (port 13)
--        { "host", "javaweb.sfbay.sun.com"  },
-+        { "host", "icedtea.classpath.org"  },
- 
-         // Reachable host that refuses connections to port 80
--        { "refusing_host", "jano1.sfbay.sun.com" },
-+        { "refusing_host", "ns1.gnu.org" },
- 
-         // Reachable host that is of sufficient hops away that a connection
-         // takes a while to be established (connect doesn't complete immediatly)
--        { "far_host", "irejano.ireland.sun.com" },
-+        { "far_host", "developer.classpath.org" },
- 
-         // Hostname that cannot be resolved by named service
-         { "unresovable_host", "blah-blah.blah-blah.blah" },
---- jdk/test/java/io/File/GetXSpace.java	2010-01-20 14:12:07.000000000 +0100
-+++ jdk/test/java/io/File/GetXSpace.java	2010-01-20 14:12:25.000000000 +0100
-@@ -49,7 +49,7 @@
-     private static final String name = System.getProperty("os.name");
-     private static final String dfFormat;
-     static {
--        if (name.equals("SunOS") || name.equals("Linux")) {
-+        if (name.equals("FreeBSD") || name.equals("SunOS") || name.equals("Linux")) {
-             // 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/tools/pack200/MemoryAllocatorTest.java	2010-01-20 14:47:29.000000000 +0100
-+++ jdk/test/tools/pack200/MemoryAllocatorTest.java	2010-01-20 14:48:02.000000000 +0100
+--- 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
 @@ -81,6 +81,7 @@
  
      static final boolean debug = Boolean.getBoolean("MemoryAllocatorTest.Debug");
@@ -135,7 +204,7 @@
      static final boolean LINUX = System.getProperty("os.name").startsWith("Linux");
      static final boolean SIXTYFOUR_BIT = System.getProperty("sun.arch.data.model", "32").equals("64");
      static final private int NATIVE_EXPECTED_EXIT_CODE = (WINDOWS) ? -1 : 255;
-@@ -424,7 +425,7 @@
+@@ -425,7 +426,7 @@
           * the error message is not accurate for us to discern if the test
           * passes successfully.
           */
@@ -144,8 +213,8 @@
              System.out.println("Warning: Windows/Linux 64bit tests passes vacuously");
              return;
          }
---- jdk/test/tools/pack200/Pack200Simple.sh	2010-01-20 14:48:44.000000000 +0100
-+++ jdk/test/tools/pack200/Pack200Simple.sh	2010-01-20 14:50:05.000000000 +0100
+--- 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.
@@ -155,41 +224,3 @@
    if [ $? != 0 ]; then
      errorOut "$jfName unzip -t test failed"
    fi
---- jdk/test/java/lang/ProcessBuilder/Zombies.java	2010-01-20 15:54:25.000000000 +0100
-+++ jdk/test/java/lang/ProcessBuilder/Zombies.java	2010-01-20 15:54:41.000000000 +0100
-@@ -49,11 +49,11 @@
-         } catch (IOException _) {/* OK */}
- 
-         try {
--            rt.exec("/bin/true", null, new File("no-such-dir"));
-+            rt.exec("/usr/bin/true", null, new File("no-such-dir"));
-             throw new Error("expected IOException not thrown");
-         } catch (IOException _) {/* OK */}
- 
--        rt.exec("/bin/true").waitFor();
-+        rt.exec("/usr/bin/true").waitFor();
- 
-         // Count all the zombies that are children of this Java process
-         final String[] zombieCounter = {
---- jdk/test/java/lang/ProcessBuilder/Basic.java	2010-01-20 16:02:00.000000000 +0100
-+++ jdk/test/java/lang/ProcessBuilder/Basic.java	2010-01-20 16:05:07.000000000 +0100
-@@ -1096,7 +1096,7 @@
-             String[] cmdp = childArgs.toArray(new String[childArgs.size()]);
-             String[] envp = {"=ExitValue=3", "=C:=\\"};
-             Process p = Runtime.getRuntime().exec(cmdp, envp);
--            String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "=C:=\\,";
-+            String expected = Windows.is() ? "=C:=\\,=ExitValue=3," : "";
-             equal(commandOutput(p), expected);
-             if (Windows.is()) {
-                 ProcessBuilder pb = new ProcessBuilder(childArgs);
---- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	2010-01-20 16:17:05.000000000 +0100
-+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	2010-01-20 16:19:55.000000000 +0100
-@@ -79,7 +79,7 @@
-         System.out.println("Test passed.");
-     }
- 
--    private static String LOAD_AVERAGE_TEXT = "load average:";
-+    private static String LOAD_AVERAGE_TEXT = "load averages:";
-     private static void checkLoadAvg() throws Exception {
-         // Obtain load average from OS command
-         ProcessBuilder pb = new ProcessBuilder("/usr/bin/uptime");