stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172457: JarDirTest.java fails after recent change

Browse Source 
Reviewed-by: iveresov
This commit is contained in:
Igor Ignatyev 2017-03-05 22:25:52 -08:00
parent ca341236ca
commit 5cdba20f81
2 changed files with 7 additions and 3 deletions
hotspot/test
ProblemList.txt
testlibrary_tests/ctw
CtwTest.java

2
hotspot/test/ProblemList.txt

@ -79,7 +79,5 @@ serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook/MAAClassFileLoadHook.ja
# :hotspot_misc
testlibrary_tests/ctw/JarDirTest.java 8172457 windows-all
#############################################################################

8
hotspot/test/testlibrary_tests/ctw/CtwTest.java

@ -37,6 +37,7 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.charset.Charset;
import jdk.test.lib.Platform;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@ -93,7 +94,12 @@ public abstract class CtwTest {
// concat CTW_COMMAND and args w/o 0th element
String[] cmd = Arrays.copyOf(CTW_COMMAND, CTW_COMMAND.length + args.length - 1);
System.arraycopy(args, 1, cmd, CTW_COMMAND.length, args.length - 1);
if (Platform.isWindows()) {
// '*' has to be escaped on windows
for (int i = 0; i < cmd.length; ++i) {
cmd[i] = cmd[i].replace("*", "\"*\"");
}
}
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmd);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
dump(output, "compile");