author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 57705 | 7cf02b2c1455 |
permissions | -rw-r--r-- |
48138 | 1 |
/* |
57567
b000362a89a0
8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds
coleenp
parents:
51990
diff
changeset
|
2 |
* Copyright (c) 2016, 2019, 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 a simple test to ensure that a directory in the --patch-module |
29 |
* option does not affect dump process |
|
30 |
* @library ../.. |
|
31 |
* @library /test/hotspot/jtreg/testlibrary |
|
32 |
* @library /test/lib |
|
57705
7cf02b2c1455
8229267: [TESTBUG] Remove unnecessary @modules dependencies in CDS tests
iklam
parents:
57567
diff
changeset
|
33 |
* @modules jdk.jartool/sun.tools.jar |
48138 | 34 |
* @build PatchMain |
51990
6003e034cdd8
8209946: [TESTBUG] CDS tests should use "@run driver"
iklam
parents:
49739
diff
changeset
|
35 |
* @run driver PatchDir |
48138 | 36 |
*/ |
37 |
||
38 |
import java.io.File; |
|
39 |
import jdk.test.lib.compiler.InMemoryJavaCompiler; |
|
40 |
||
41 |
public class PatchDir { |
|
42 |
private static String moduleJar; |
|
43 |
||
44 |
public static void main(String args[]) throws Throwable { |
|
45 |
||
46 |
// Create a class file in the module java.naming. This class file |
|
47 |
// will be put in the javanaming.jar file. |
|
48 |
String source = "package javax.naming.spi; " + |
|
49 |
"public class NamingManager { " + |
|
50 |
" static { " + |
|
51 |
" System.out.println(\"I pass!\"); " + |
|
52 |
" } " + |
|
53 |
"}"; |
|
54 |
||
55 |
String classDir = System.getProperty("test.classes"); |
|
56 |
ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", |
|
57 |
InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "--patch-module=java.naming"), |
|
58 |
classDir); |
|
59 |
||
60 |
JarBuilder.build("javanaming", "javax/naming/spi/NamingManager"); |
|
61 |
moduleJar = TestCommon.getTestJar("javanaming.jar"); |
|
62 |
||
63 |
System.out.println("Test dumping with --patch-module"); |
|
64 |
TestCommon.dump(null, |
|
65 |
TestCommon.list("javax/naming/spi/NamingManager"), |
|
66 |
"--patch-module=java.naming=" + moduleJar, |
|
67 |
"-Xlog:class+load", |
|
68 |
"PatchMain", "javax.naming.spi.NamingManager") |
|
49739
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
48469
diff
changeset
|
69 |
.shouldContain("Cannot use the following option when dumping the shared archive: --patch-module") |
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
48469
diff
changeset
|
70 |
.shouldHaveExitValue(1); |
48138 | 71 |
} |
72 |
} |