author | hseigel |
Wed, 10 Aug 2016 15:48:04 -0700 | |
changeset 40244 | b3055c216762 |
child 40631 | ed82623d7831 |
permissions | -rw-r--r-- |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
1 |
/* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
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 |
* @bug 8069469 |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
27 |
* @summary Make sure -Xlog:classload=info works properly with "modules" jimage, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
28 |
--patch-module, and with -Xbootclasspath/a |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
29 |
* @modules java.base/jdk.internal.misc |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
30 |
* @library /testlibrary |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
31 |
* @compile PatchModuleMain.java |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
32 |
* @run main PatchModuleTraceCL |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
33 |
*/ |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
34 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
35 |
import java.io.File; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
36 |
import jdk.test.lib.*; |
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 PatchModuleTraceCL { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
39 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
40 |
public static void main(String[] args) throws Exception { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
41 |
String source = "package javax.naming.spi; " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
42 |
"public class NamingManager { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
43 |
" static { " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
44 |
" System.out.println(\"I pass!\"); " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
45 |
" } " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
46 |
"}"; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
47 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
48 |
// Test -Xlog:classload=info output for --patch-module |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
49 |
ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
50 |
InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "-Xmodule:java.naming"), |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
51 |
"mods/java.naming"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
52 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
53 |
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("--patch-module=java.naming=mods/java.naming", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
54 |
"-Xlog:class+load=info", "PatchModuleMain", "javax.naming.spi.NamingManager"); |
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 |
OutputAnalyzer output = new OutputAnalyzer(pb.start()); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
57 |
// "modules" jimage case. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
58 |
output.shouldContain("[class,load] java.lang.Thread source: jrt:/java.base"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
59 |
// --patch-module case. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
60 |
output.shouldContain("[class,load] javax.naming.spi.NamingManager source: mods/java.naming"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
61 |
// -cp case. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
62 |
output.shouldContain("[class,load] PatchModuleMain source: file"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
63 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
64 |
// Test -Xlog:classload=info output for -Xbootclasspath/a |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
65 |
source = "package PatchModuleTraceCL_pkg; " + |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
66 |
"public class ItIsI { " + |
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(\"I also pass!\"); " + |
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("PatchModuleTraceCL_pkg/ItIsI", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
73 |
InMemoryJavaCompiler.compile("PatchModuleTraceCL_pkg.ItIsI", source), |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
74 |
"xbcp"); |
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 |
pb = ProcessTools.createJavaProcessBuilder("-Xbootclasspath/a:xbcp", |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
77 |
"-Xlog:class+load=info", "PatchModuleMain", "PatchModuleTraceCL_pkg.ItIsI"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
78 |
output = new OutputAnalyzer(pb.start()); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
79 |
// -Xbootclasspath/a case. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
80 |
output.shouldContain("[class,load] PatchModuleTraceCL_pkg.ItIsI source: xbcp"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
81 |
output.shouldHaveExitValue(0); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
82 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
diff
changeset
|
83 |
} |