author | amlu |
Fri, 14 Apr 2017 15:30:39 +0800 | |
changeset 44669 | 1f2cfb3b2d3c |
parent 41828 | 0436ea0c6099 |
child 45467 | 99c87a16a8e4 |
permissions | -rw-r--r-- |
41828
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
1 |
/* |
44669
1f2cfb3b2d3c
8169971: JLinkMultiReleaseJarTest.java fails intermittently at the final clean up
amlu
parents:
41828
diff
changeset
|
2 |
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. |
41828
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
4 |
* |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
8 |
* |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
13 |
* accompanied this code). |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
14 |
* |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
18 |
* |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
21 |
* questions. |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
22 |
*/ |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
23 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
24 |
/* |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
25 |
* @test |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
26 |
* @bug 8156499 |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
27 |
* @summary Test image creation from Multi-Release JAR |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
28 |
* @author Steve Drach |
44669
1f2cfb3b2d3c
8169971: JLinkMultiReleaseJarTest.java fails intermittently at the final clean up
amlu
parents:
41828
diff
changeset
|
29 |
* @library /test/lib |
41828
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
30 |
* @modules java.base/jdk.internal.jimage |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
31 |
* java.base/jdk.internal.module |
44669
1f2cfb3b2d3c
8169971: JLinkMultiReleaseJarTest.java fails intermittently at the final clean up
amlu
parents:
41828
diff
changeset
|
32 |
* @build jdk.test.lib.process.* |
41828
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
33 |
* @run testng JLinkMultiReleaseJarTest |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
34 |
*/ |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
35 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
36 |
import java.io.ByteArrayInputStream; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
37 |
import java.io.IOException; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
38 |
import java.lang.invoke.MethodHandle; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
39 |
import java.lang.invoke.MethodHandles; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
40 |
import java.lang.invoke.MethodType; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
41 |
import java.lang.module.ModuleDescriptor; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
42 |
import java.nio.file.Files; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
43 |
import java.nio.file.Path; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
44 |
import java.nio.file.Paths; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
45 |
import java.nio.file.StandardCopyOption; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
46 |
import java.util.Arrays; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
47 |
import java.util.Set; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
48 |
import java.util.jar.JarFile; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
49 |
import java.util.spi.ToolProvider; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
50 |
import java.util.stream.Collectors; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
51 |
import java.util.stream.Stream; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
52 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
53 |
import jdk.internal.jimage.BasicImageReader; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
54 |
import jdk.test.lib.process.ProcessTools; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
55 |
import jdk.test.lib.process.OutputAnalyzer; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
56 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
57 |
import org.testng.Assert; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
58 |
import org.testng.annotations.BeforeClass; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
59 |
import org.testng.annotations.Test; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
60 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
61 |
public class JLinkMultiReleaseJarTest { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
62 |
private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar") |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
63 |
.orElseThrow(() -> new RuntimeException("jar tool not found")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
64 |
private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac") |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
65 |
.orElseThrow(() -> new RuntimeException("javac tool not found")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
66 |
private static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink") |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
67 |
.orElseThrow(() -> new RuntimeException("jlink tool not found")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
68 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
69 |
private final Path userdir = Paths.get(System.getProperty("user.dir", ".")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
70 |
private final Path javahome = Paths.get(System.getProperty("java.home")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
71 |
private final Path jmodsdir = javahome.resolve("jmods"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
72 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
73 |
private final String pathsep = System.getProperty("path.separator"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
74 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
75 |
private byte[] resource = (Runtime.version().major() + " resource file").getBytes(); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
76 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
77 |
@BeforeClass |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
78 |
public void initialize() throws IOException { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
79 |
Path srcdir = Paths.get(System.getProperty("test.src")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
80 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
81 |
// create class files from source |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
82 |
Path base = srcdir.resolve("base"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
83 |
Path basemods = userdir.resolve("basemods"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
84 |
javac(base, basemods, base.toString()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
85 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
86 |
Path rt = srcdir.resolve("rt"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
87 |
Path rtmods = userdir.resolve("rtmods"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
88 |
javac(rt, rtmods, rt.toString()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
89 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
90 |
// create resources in basemods and rtmods |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
91 |
Path dest = basemods.resolve("m1").resolve("resource.txt"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
92 |
byte[] text = "base resource file".getBytes(); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
93 |
ByteArrayInputStream is = new ByteArrayInputStream(text); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
94 |
Files.copy(is, dest); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
95 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
96 |
dest = rtmods.resolve("m1").resolve("resource.txt"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
97 |
is = new ByteArrayInputStream(resource); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
98 |
Files.copy(is, dest); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
99 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
100 |
// build multi-release jar file with different module-infos |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
101 |
String[] args = { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
102 |
"-cf", "m1.jar", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
103 |
"-C", basemods.resolve("m1").toString(), ".", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
104 |
"--release ", String.valueOf(JarFile.runtimeVersion().major()), |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
105 |
"-C", rtmods.resolve("m1").toString(), "." |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
106 |
}; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
107 |
JAR_TOOL.run(System.out, System.err, args); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
108 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
109 |
// now move the module-info that requires logging to temporary place |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
110 |
Files.move(rtmods.resolve("m1").resolve("module-info.class"), |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
111 |
userdir.resolve("module-info.class")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
112 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
113 |
// and build another jar |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
114 |
args[1] = "m1-no-logging.jar"; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
115 |
JAR_TOOL.run(System.out, System.err, args); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
116 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
117 |
// replace the no logging module-info with the logging module-info |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
118 |
Files.move(userdir.resolve("module-info.class"), |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
119 |
basemods.resolve("m1").resolve("module-info.class"), |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
120 |
StandardCopyOption.REPLACE_EXISTING); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
121 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
122 |
// and build another jar |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
123 |
args[1] = "m1-logging.jar"; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
124 |
JAR_TOOL.run(System.out, System.err, args); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
125 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
126 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
127 |
private void javac(Path source, Path destination, String srcpath) throws IOException { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
128 |
String[] args = Stream.concat( |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
129 |
Stream.of("-d", destination.toString(), "--module-source-path", srcpath), |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
130 |
Files.walk(source) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
131 |
.map(Path::toString) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
132 |
.filter(s -> s.endsWith(".java")) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
133 |
).toArray(String[]::new); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
134 |
int rc = JAVAC_TOOL.run(System.out, System.err, args); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
135 |
Assert.assertEquals(rc, 0); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
136 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
137 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
138 |
@Test |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
139 |
public void basicTest() throws Throwable { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
140 |
if (ignoreTest()) return; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
141 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
142 |
// use jlink to build image from multi-release jar |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
143 |
jlink("m1.jar", "myimage"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
144 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
145 |
// validate image |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
146 |
Path jimage = userdir.resolve("myimage").resolve("lib").resolve("modules"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
147 |
try (BasicImageReader reader = BasicImageReader.open(jimage)) { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
148 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
149 |
// do we have the right entry names? |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
150 |
Set<String> names = Arrays.stream(reader.getEntryNames()) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
151 |
.filter(n -> n.startsWith("/m1")) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
152 |
.collect(Collectors.toSet()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
153 |
Assert.assertEquals(names, Set.of( |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
154 |
"/m1/module-info.class", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
155 |
"/m1/p/Main.class", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
156 |
"/m1/p/Type.class", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
157 |
"/m1/q/PublicClass.class", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
158 |
"/m1/META-INF/MANIFEST.MF", |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
159 |
"/m1/resource.txt")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
160 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
161 |
// do we have the right module-info.class? |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
162 |
byte[] b = reader.getResource("/m1/module-info.class"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
163 |
Set<String> requires = ModuleDescriptor |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
164 |
.read(new ByteArrayInputStream(b)) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
165 |
.requires() |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
166 |
.stream() |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
167 |
.map(mdr -> mdr.name()) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
168 |
.filter(nm -> !nm.equals("java.base")) |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
169 |
.collect(Collectors.toSet()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
170 |
Assert.assertEquals(requires, Set.of("java.logging")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
171 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
172 |
// do we have the right resource? |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
173 |
b = reader.getResource("/m1/resource.txt"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
174 |
Assert.assertEquals(b, resource); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
175 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
176 |
// do we have the right class? |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
177 |
b = reader.getResource("/m1/p/Main.class"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
178 |
Class<?> clazz = (new ByteArrayClassLoader()).loadClass("p.Main", b); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
179 |
MethodHandle getVersion = MethodHandles.lookup() |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
180 |
.findVirtual(clazz, "getVersion", MethodType.methodType(int.class)); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
181 |
int version = (int) getVersion.invoke(clazz.getConstructor().newInstance()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
182 |
Assert.assertEquals(version, JarFile.runtimeVersion().major()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
183 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
184 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
185 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
186 |
@Test |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
187 |
public void noLoggingTest() throws Throwable { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
188 |
if (ignoreTest()) return; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
189 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
190 |
jlink("m1-no-logging.jar", "no-logging-image"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
191 |
runImage("no-logging-image", false); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
192 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
193 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
194 |
@Test |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
195 |
public void loggingTest() throws Throwable { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
196 |
if (ignoreTest()) return; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
197 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
198 |
jlink("m1-logging.jar", "logging-image"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
199 |
runImage("logging-image", true); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
200 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
201 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
202 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
203 |
// java.base.jmod must exist for this test to make sense |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
204 |
private boolean ignoreTest() { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
205 |
if (Files.isRegularFile(jmodsdir.resolve("java.base.jmod"))) { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
206 |
return false; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
207 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
208 |
System.err.println("Test skipped. NO jmods/java.base.jmod"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
209 |
return true; |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
210 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
211 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
212 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
213 |
private void jlink(String jar, String image) { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
214 |
String args = "--output " + image + " --add-modules m1 --module-path " + |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
215 |
jar + pathsep + jmodsdir.toString(); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
216 |
int exitCode = JLINK_TOOL.run(System.out, System.err, args.split(" +")); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
217 |
Assert.assertEquals(exitCode, 0); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
218 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
219 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
220 |
public void runImage(String image, boolean expected) throws Throwable { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
221 |
Path java = Paths.get(image, "bin", "java"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
222 |
OutputAnalyzer oa = ProcessTools.executeProcess(java.toString(), "-m", "m1/p.Main"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
223 |
String sout = oa.getStdout(); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
224 |
boolean actual = sout.contains("logging found"); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
225 |
Assert.assertEquals(actual, expected); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
226 |
System.out.println(sout); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
227 |
System.err.println(oa.getStderr()); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
228 |
Assert.assertEquals(oa.getExitValue(), 0); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
229 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
230 |
|
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
231 |
private static class ByteArrayClassLoader extends ClassLoader { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
232 |
public Class<?> loadClass(String name, byte[] bytes) { |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
233 |
return defineClass(name, bytes, 0, bytes.length); |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
234 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
235 |
} |
0436ea0c6099
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff
changeset
|
236 |
} |