author | hseigel |
Thu, 10 Aug 2017 11:12:13 -0400 | |
changeset 46790 | 8c4deba6a0ee |
parent 45112 | fbec2bfa3839 |
permissions | -rw-r--r-- |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
1 |
/* |
46790
8c4deba6a0ee
8177741: Fix hotspot tests to use --patch-module instead of -Xmodule
hseigel
parents:
45112
diff
changeset
|
2 |
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
4 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
8 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
13 |
* accompanied this code). |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
14 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
18 |
* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
21 |
* questions. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
22 |
*/ |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
23 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
24 |
/* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
25 |
* @test |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
26 |
* @summary Make sure --patch-module works when a jar file is specified for a module |
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
27 |
* @library /test/lib |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
28 |
* @modules java.base/jdk.internal.misc |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
29 |
* jdk.jartool/sun.tools.jar |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
30 |
* @compile PatchModuleMain.java |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
31 |
* @run main PatchModuleTestJar |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
32 |
*/ |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
33 |
|
45112
fbec2bfa3839
8180037: move jdk.test.lib.InMemoryJavaCompiler to a separate package
iignatyev
parents:
40631
diff
changeset
|
34 |
import jdk.test.lib.compiler.InMemoryJavaCompiler; |
40631
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
35 |
import jdk.test.lib.process.OutputAnalyzer; |
ed82623d7831
8157957: ClassNotFoundException: jdk.test.lib.JDKToolFinder
ctornqvi
parents:
40244
diff
changeset
|
36 |
import jdk.test.lib.process.ProcessTools; |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
37 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
38 |
public class PatchModuleTestJar { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
39 |
private static String moduleJar; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
40 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
41 |
public static void main(String[] args) throws Exception { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
42 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
43 |
// Create a class file in the module java.naming. This class file |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
44 |
// will be put in the javanaming.jar file. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
45 |
String source = "package javax.naming.spi; " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
46 |
"public class NamingManager { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
47 |
" static { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
48 |
" System.out.println(\"I pass!\"); " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
49 |
" } " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
50 |
"}"; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
51 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
52 |
ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", |
46790
8c4deba6a0ee
8177741: Fix hotspot tests to use --patch-module instead of -Xmodule
hseigel
parents:
45112
diff
changeset
|
53 |
InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "--patch-module=java.naming"), |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
54 |
System.getProperty("test.classes")); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
55 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
56 |
// Build the jar file that will be used for the module "java.naming". |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
57 |
BasicJarBuilder.build("javanaming", "javax/naming/spi/NamingManager"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
58 |
moduleJar = BasicJarBuilder.getTestJar("javanaming.jar"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
59 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
60 |
// Just to make sure we are not fooled by the class file being on the |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
61 |
// class path where all the test classes are stored, write the NamingManager.class |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
62 |
// file out again with output that does not contain what OutputAnalyzer |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
63 |
// expects. This will provide confidence that the contents of the class |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
64 |
// is truly coming from the jar file and not the class file. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
65 |
source = "package javax.naming.spi; " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
66 |
"public class NamingManager { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
67 |
" static { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
68 |
" System.out.println(\"Fail!\"); " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
69 |
" } " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
70 |
"}"; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
71 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
72 |
ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", |
46790
8c4deba6a0ee
8177741: Fix hotspot tests to use --patch-module instead of -Xmodule
hseigel
parents:
45112
diff
changeset
|
73 |
InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "--patch-module=java.naming"), |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
74 |
System.getProperty("test.classes")); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
75 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
76 |
// Supply --patch-module with the name of the jar file for the module java.naming. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
77 |
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("--patch-module=java.naming=" + moduleJar, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
78 |
"PatchModuleMain", "javax.naming.spi.NamingManager"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
79 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
80 |
new OutputAnalyzer(pb.start()) |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
81 |
.shouldContain("I pass!") |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
82 |
.shouldHaveExitValue(0); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
83 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
84 |
} |