equal
deleted
inserted
replaced
252 String graalJarsCP = graalJars.stream() |
252 String graalJarsCP = graalJars.stream() |
253 .map(s -> String.join(File.separator, libsDir, s)) |
253 .map(s -> String.join(File.separator, libsDir, s)) |
254 .collect(Collectors.joining(File.pathSeparator)); |
254 .collect(Collectors.joining(File.pathSeparator)); |
255 |
255 |
256 javaFlags.add("-cp"); |
256 javaFlags.add("-cp"); |
257 javaFlags.add(String.join(File.pathSeparator, System.getProperty("java.class.path"), graalJarsCP)); |
257 // Existing classpath returned by System.getProperty("java.class.path") may contain another |
|
258 // version of junit with which the jtreg tool is built. It may be incompatible with required |
|
259 // junit version. So we put graalJarsCP before existing classpath when generating a new one |
|
260 // to avoid incompatibility issues. |
|
261 javaFlags.add(String.join(File.pathSeparator, graalJarsCP, System.getProperty("java.class.path"))); |
258 |
262 |
259 // |
263 // |
260 javaFlags.add("com.oracle.mxtool.junit.MxJUnitWrapper"); |
264 javaFlags.add("com.oracle.mxtool.junit.MxJUnitWrapper"); |
261 javaFlags.add("-JUnitVerbose"); |
265 javaFlags.add("-JUnitVerbose"); |
262 javaFlags.add("-JUnitEagerStackTrace"); |
266 javaFlags.add("-JUnitEagerStackTrace"); |