infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 17:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

7174723: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing [win]

Browse Source 
Reviewed-by: mduigou
This commit is contained in:
Alan Bateman 2012-06-07 18:42:47 +01:00
parent e830ff8c8f
commit 519dc0c3f9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/test/java/lang/ProcessBuilder/Basic.java
View File

@ -248,6 +248,7 @@ public class Basic {
private static String getenvAsString(Map<String,String> environment) {
StringBuilder sb = new StringBuilder();
environment = new TreeMap<>(environment);
for (Map.Entry<String,String> e : environment.entrySet())
// Ignore magic environment variables added by the launcher
if (! e.getKey().equals("NLSPATH") &&
@ -1625,7 +1626,7 @@ public class Basic {
childArgs.add("System.getenv()");
String[] cmdp = childArgs.toArray(new String[childArgs.size()]);
String[] envp;
String[] envpWin = {"=ExitValue=3", "=C:=\\", "SystemRoot="+systemRoot};
String[] envpWin = {"=C:=\\", "=ExitValue=3", "SystemRoot="+systemRoot};
String[] envpOth = {"=ExitValue=3", "=C:=\\"};
if (Windows.is()) {
envp = envpWin;
@ -1633,7 +1634,7 @@ public class Basic {
envp = envpOth;
}
Process p = Runtime.getRuntime().exec(cmdp, envp);
String expected = Windows.is() ? "=C:=\\,SystemRoot="+systemRoot+",=ExitValue=3," : "=C:=\\,";
String expected = Windows.is() ? "=C:=\\,=ExitValue=3,SystemRoot="+systemRoot+"," : "=C:=\\,";
String commandOutput = commandOutput(p);
if (MacOSX.is()) {
commandOutput = removeMacExpectedVars(commandOutput);
@ -1690,7 +1691,7 @@ public class Basic {
commandOutput = removeMacExpectedVars(commandOutput);
}
check(commandOutput.equals(Windows.is()
? "SystemRoot="+systemRoot+",LC_ALL=C,"
? "LC_ALL=C,SystemRoot="+systemRoot+","
: "LC_ALL=C,"),
"Incorrect handling of envstrings containing NULs");
} catch (Throwable t) { unexpected(t); }