test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java
author chegar
Thu, 17 Oct 2019 20:54:25 +0100
branchdatagramsocketimpl-branch
changeset 58679 9c3209ff7550
parent 58678 9cf78a70fa4f
parent 57705 7cf02b2c1455
permissions -rw-r--r--
datagramsocketimpl-branch: merge with default
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     1
/*
53636
962ed57b29c9 8218029: [TESTBUG] Use -Djava.class.path= to specify empty -cp in CDS tests
iklam
parents: 51990
diff changeset
     2
 * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     4
 *
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     7
 * published by the Free Software Foundation.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     8
 *
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    13
 * accompanied this code).
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    14
 *
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    18
 *
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    21
 * questions.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    22
 *
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    23
 */
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    24
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    25
/**
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    26
 * @test
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    27
 * @requires vm.cds
57567
b000362a89a0 8202339: [TESTBUG] Consolidate the tests in runtime/SharedArchiveFile and runtime/appcds
coleenp
parents: 54927
diff changeset
    28
 * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
57705
7cf02b2c1455 8229267: [TESTBUG] Remove unnecessary @modules dependencies in CDS tests
iklam
parents: 57567
diff changeset
    29
 * @modules jdk.jartool/sun.tools.jar
54927
1512d88b24c6 8207812: Implement Dynamic CDS Archive
ccheung
parents: 53636
diff changeset
    30
 * @compile ../../test-classes/Hello.java
51990
6003e034cdd8 8209946: [TESTBUG] CDS tests should use "@run driver"
iklam
parents: 51675
diff changeset
    31
 * @run driver AddModules
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    32
 * @summary sanity test the --add-modules option
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    33
 */
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    34
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    35
import java.io.File;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    36
import java.nio.file.Files;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    37
import java.nio.file.Path;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    38
import java.nio.file.Paths;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    39
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    40
import jdk.test.lib.process.OutputAnalyzer;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    41
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    42
public class AddModules {
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    43
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    44
    private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    45
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    46
    private static final String TEST_SRC = System.getProperty("test.src");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    47
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    48
    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    49
    private static final Path MODS_DIR = Paths.get("mods");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    50
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    51
    // the module name of the test module
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    52
    private static final String MAIN_MODULE1 = "com.greetings";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    53
    private static final String MAIN_MODULE2 = "com.hello";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    54
    private static final String SUB_MODULE = "org.astro";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    55
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    56
    // the module main class
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    57
    private static final String MAIN_CLASS1 = "com.greetings.Main";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    58
    private static final String MAIN_CLASS2 = "com.hello.Main";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    59
    private static final String APP_CLASS = "org.astro.World";
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    60
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    61
    private static Path moduleDir = null;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    62
    private static Path subJar = null;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    63
    private static Path mainJar1 = null;
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    64
    private static Path mainJar2 = null;
54927
1512d88b24c6 8207812: Implement Dynamic CDS Archive
ccheung
parents: 53636
diff changeset
    65
    private static String appJar;
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    66
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    67
    public static void buildTestModule() throws Exception {
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    68
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    69
        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    70
        JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    71
                                 MODS_DIR.resolve(SUB_MODULE),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    72
                                 null);
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    73
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    74
        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    75
        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE1),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    76
                                 MODS_DIR.resolve(MAIN_MODULE1),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    77
                                 MODS_DIR.toString());
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    78
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    79
        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE2),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    80
                                 MODS_DIR.resolve(MAIN_MODULE2),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    81
                                 MODS_DIR.toString());
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    82
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    83
        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    84
        subJar = moduleDir.resolve(SUB_MODULE + ".jar");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    85
        String classes = MODS_DIR.resolve(SUB_MODULE).toString();
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    86
        JarBuilder.createModularJar(subJar.toString(), classes, null);
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    87
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    88
        mainJar1 = moduleDir.resolve(MAIN_MODULE1 + ".jar");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    89
        classes = MODS_DIR.resolve(MAIN_MODULE1).toString();
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    90
        JarBuilder.createModularJar(mainJar1.toString(), classes, MAIN_CLASS1);
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    91
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    92
        mainJar2 = moduleDir.resolve(MAIN_MODULE2 + ".jar");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    93
        classes = MODS_DIR.resolve(MAIN_MODULE2).toString();
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    94
        JarBuilder.createModularJar(mainJar2.toString(), classes, MAIN_CLASS2);
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    95
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    96
    }
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    97
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
    98
    public static void main(String... args) throws Exception {
54927
1512d88b24c6 8207812: Implement Dynamic CDS Archive
ccheung
parents: 53636
diff changeset
    99
        appJar = JarBuilder.getOrCreateHelloJar();
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   100
        // compile the modules and create the modular jar files
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   101
        buildTestModule();
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   102
        String appClasses[] = {MAIN_CLASS1, MAIN_CLASS2, APP_CLASS};
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   103
        // create an archive with the classes in the modules built in the
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   104
        // previous step
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   105
        OutputAnalyzer output = TestCommon.createArchive(
54927
1512d88b24c6 8207812: Implement Dynamic CDS Archive
ccheung
parents: 53636
diff changeset
   106
                                        appJar, appClasses,
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   107
                                        "--module-path", moduleDir.toString(),
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   108
                                        "--add-modules",
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   109
                                        MAIN_MODULE1 + "," + MAIN_MODULE2);
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   110
        TestCommon.checkDump(output);
54927
1512d88b24c6 8207812: Implement Dynamic CDS Archive
ccheung
parents: 53636
diff changeset
   111
        String prefix[] = {"-Djava.class.path=" + appJar, "-Xlog:class+load=trace"};
49739
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   112
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   113
        // run the com.greetings module with the archive with the --module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   114
        // the same as the one during dump time.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   115
        // The classes should be loaded from the archive.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   116
        TestCommon.runWithModules(prefix,
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   117
                                  null, // --upgrade-module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   118
                                  moduleDir.toString(), // --module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   119
                                  MAIN_MODULE1) // -m
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   120
            .assertNormalExit(out -> {
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   121
                out.shouldContain("[class,load] com.greetings.Main source: shared objects file")
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   122
                   .shouldContain("[class,load] org.astro.World source: shared objects file");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   123
            });
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   124
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   125
        // run the com.hello module with the archive with the --module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   126
        // the same as the one during dump time.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   127
        // The classes should be loaded from the archive.
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   128
        TestCommon.runWithModules(prefix,
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   129
                                  null, // --upgrade-module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   130
                                  moduleDir.toString(), // --module-path
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   131
                                  MAIN_MODULE2) // -m
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   132
            .assertNormalExit(out -> {
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   133
                out.shouldContain("[class,load] com.hello.Main source: shared objects file")
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   134
                   .shouldContain("[class,load] org.astro.World source: shared objects file");
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   135
            });
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   136
    }
00805b129186 8194812: Extend class-data sharing to support the module path
ccheung
parents:
diff changeset
   137
}