--- a/hotspot/test/native/GTestWrapper.java Tue May 31 17:09:45 2016 +0200
+++ b/hotspot/test/native/GTestWrapper.java Tue May 31 15:21:56 2016 -0400
@@ -61,14 +61,11 @@
throw new Error("TESTBUG: the library has not been found in " + nativePath);
}
path = path.resolve("gtestLauncher" + (Platform.isWindows() ? ".exe" : ""));
- Stream<String> launcherArgs = Stream.of(path.toString(), "-jdk",
- System.getProperty("test.jdk"));
- // JVM accepts only -X and -D flags
- Stream<String> vmFLags = Arrays.stream(Utils.getTestJavaOpts())
- .filter(s -> s.startsWith("-X") || s.startsWith("-D"));
- String[] cmds = Stream.concat(launcherArgs, vmFLags)
- .toArray(String[]::new);
- ProcessTools.executeCommand(cmds).shouldHaveExitValue(0);
+ ProcessTools.executeCommand(new String[] {
+ path.toString(),
+ "-jdk",
+ System.getProperty("test.jdk")
+ }).shouldHaveExitValue(0);
}
private static String getJVMVariantSubDir() {