author | jiangli |
Mon, 21 May 2018 15:15:58 -0400 | |
changeset 50199 | 83d8b3a25f25 |
parent 49739 | 00805b129186 |
child 51990 | 6003e034cdd8 |
permissions | -rw-r--r-- |
48138 | 1 |
/* |
48979
514c73a1955b
8179249: Improve process output analysis in CDS tests
iklam
parents:
48469
diff
changeset
|
2 |
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. |
48138 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
||
25 |
/* |
|
26 |
* @test |
|
48469
7312ae4465d6
8193672: [test] Enhance vm.cds property to check for all conditions required to run CDS tests
iklam
parents:
48138
diff
changeset
|
27 |
* @requires vm.cds |
48138 | 28 |
* @summary if a class is defined to a package which is not defined to any |
29 |
* module in the jimage, the class will not be found during dump |
|
30 |
* time but it will be used during run time. |
|
31 |
* @library ../.. |
|
32 |
* @library /test/hotspot/jtreg/testlibrary |
|
33 |
* @library /test/lib |
|
34 |
* @modules java.base/jdk.internal.misc |
|
35 |
* jdk.jartool/sun.tools.jar |
|
36 |
* @build PatchMain |
|
37 |
* @run main CustomPackage |
|
38 |
*/ |
|
39 |
||
40 |
import jdk.test.lib.compiler.InMemoryJavaCompiler; |
|
41 |
import jdk.test.lib.process.OutputAnalyzer; |
|
42 |
||
43 |
public class CustomPackage { |
|
44 |
private static String moduleJar; |
|
45 |
||
46 |
public static void main(String args[]) throws Throwable { |
|
47 |
||
48 |
// Create a class file in the module java.naming. This class file |
|
49 |
// will be put in the javanaming.jar file. |
|
50 |
String source = "package javax.naming.myspi; " + |
|
51 |
"public class NamingManager { " + |
|
52 |
" static { " + |
|
53 |
" System.out.println(\"I pass!\"); " + |
|
54 |
" } " + |
|
55 |
"}"; |
|
56 |
||
57 |
ClassFileInstaller.writeClassToDisk("javax/naming/myspi/NamingManager", |
|
58 |
InMemoryJavaCompiler.compile("javax.naming.myspi.NamingManager", source, "--patch-module=java.naming"), |
|
59 |
System.getProperty("test.classes")); |
|
60 |
||
61 |
// Build the jar file that will be used for the module "java.naming". |
|
62 |
JarBuilder.build("javanaming", "javax/naming/myspi/NamingManager"); |
|
63 |
moduleJar = TestCommon.getTestJar("javanaming.jar"); |
|
64 |
||
65 |
System.out.println("Test dumping with --patch-module"); |
|
66 |
OutputAnalyzer output = |
|
67 |
TestCommon.dump(null, |
|
68 |
TestCommon.list("javax/naming/myspi/NamingManager"), |
|
69 |
"--patch-module=java.naming=" + moduleJar, |
|
70 |
"-Xlog:class+load", |
|
71 |
"-Xlog:class+path=info", |
|
72 |
"PatchMain", "javax.naming.myspi.NamingManager"); |
|
49739
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
48979
diff
changeset
|
73 |
output.shouldHaveExitValue(1) |
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
48979
diff
changeset
|
74 |
.shouldContain("Cannot use the following option when dumping the shared archive: --patch-module"); |
48138 | 75 |
|
48979
514c73a1955b
8179249: Improve process output analysis in CDS tests
iklam
parents:
48469
diff
changeset
|
76 |
TestCommon.run( |
48138 | 77 |
"-XX:+UnlockDiagnosticVMOptions", |
78 |
"--patch-module=java.naming=" + moduleJar, |
|
79 |
"-Xlog:class+load", |
|
80 |
"-Xlog:class+path=info", |
|
48979
514c73a1955b
8179249: Improve process output analysis in CDS tests
iklam
parents:
48469
diff
changeset
|
81 |
"PatchMain", "javax.naming.myspi.NamingManager") |
49739
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
48979
diff
changeset
|
82 |
.assertSilentlyDisabledCDS(0, "I pass!"); |
48138 | 83 |
} |
84 |
} |