--- old/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java 2017-07-05 08:14:00.000000000 +0100 +++ new/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java 2017-07-05 08:14:00.000000000 +0100 @@ -21,14 +21,19 @@ * questions. */ +import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.stream.Stream; public class SetupJar { - public static void main(String args[]) throws Exception { - Path classes = Paths.get(System.getProperty("test.classes", "")); - JarUtils.createJarFile(Paths.get("privileged.jar"), - classes.resolve("bootlib")); + String cp = System.getProperty("test.class.path"); + Path bootlib = Stream.of(cp.split(File.pathSeparator)) + .map(Paths::get) + .filter(e -> e.endsWith("bootlib")) // file name + .findAny() + .orElseThrow(() -> new InternalError("bootlib not found")); + JarUtils.createJarFile(Paths.get("privileged.jar"), bootlib); } }