8158106: native/GTestWrapper.java gets SIGABR
authorctornqvi
Tue, 31 May 2016 15:21:56 -0400
changeset 38731 2c741a995b07
parent 38730 081e6ad12023
child 38732 bb77e0dcc7e5
8158106: native/GTestWrapper.java gets SIGABR Reviewed-by: lfoltan, gtriantafill
hotspot/test/native/GTestWrapper.java
--- 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() {