langtools/test/tools/javac/modules/InheritRuntimeEnvironmentTest.java
author jjg
Wed, 10 Aug 2016 15:47:46 -0700
changeset 40308 274367a99f98
child 40513 39b67170b045
permissions -rw-r--r--
8136930: Simplify use of module-system options by custom launchers 8160489: Multiple -Xpatch lines ignored by javac 8156998: javac should support new option -XinheritRuntimeEnvironment Reviewed-by: jlahoda, ksrini
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     1
/*
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     2
 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     4
 *
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     8
 *
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    13
 * accompanied this code).
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    14
 *
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    18
 *
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    21
 * questions.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    22
 */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    23
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    24
/**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    25
 * @test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    26
 * @bug 8156998
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    27
 * @summary Test --inherit-runtime-environment
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    28
 * @library /tools/lib
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    29
 * @modules
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    30
 *      jdk.compiler/com.sun.tools.javac.api
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    31
 *      jdk.compiler/com.sun.tools.javac.main
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    32
 * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavaTask ModuleTestBase
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    33
 * @run main InheritRuntimeEnvironmentTest
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    34
 */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    35
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    36
import java.io.IOException;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    37
import java.nio.file.Files;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    38
import java.nio.file.Path;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    39
import java.util.Arrays;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    40
import java.util.Collections;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    41
import java.util.List;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    42
import java.util.stream.Collectors;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    43
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    44
import toolbox.ModuleBuilder;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    45
import toolbox.JavaTask;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    46
import toolbox.JavacTask;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    47
import toolbox.Task;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    48
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    49
/**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    50
 * Tests that javac picks up runtime options with --inherit-runtime-environment.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    51
 * For each option, javac is first run using the option directly, as a control.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    52
 * javac is then run again, with the same option(s) being passed to the runtime,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    53
 * and --inherit-runtime-environment being used by javac.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    54
 * @author jjg
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    55
 */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    56
public class InheritRuntimeEnvironmentTest extends ModuleTestBase {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    57
    public static void main(String... args) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    58
        InheritRuntimeEnvironmentTest t = new InheritRuntimeEnvironmentTest();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    59
        t.runTests();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    60
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    61
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    62
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    63
     * Tests that code being compiled can access JDK-internal API using -add-exports.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    64
     * @param base
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    65
     * @throws Exception
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    66
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    67
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    68
    public void testAddExports(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    69
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    70
        tb.writeJavaFiles(src,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    71
                "class C { com.sun.tools.javac.main.Main main; }");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    72
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    73
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    74
                .testOpts("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    75
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    76
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    77
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    78
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    79
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    80
     * Tests that code in the unnamed module can access a module on the module path using --add-modules.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    81
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    82
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    83
    public void testAddModules(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    84
        Path modules = base.resolve("modules");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    85
        new ModuleBuilder(tb, "m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    86
                .exports("pkg1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    87
                .classes("package pkg1; public class C1 { }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    88
                .build(modules);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    89
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    90
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    91
        tb.writeJavaFiles(src,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    92
                "class C { pkg1.C1 c1; }");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    93
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    94
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    95
                .testOpts("--module-path", modules.toString(), "--add-modules", "m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    96
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    97
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    98
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
    99
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   100
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   101
     * Tests that a module on the module path is not visible when --limit-modules is used to
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   102
     * restrict the set of observable modules.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   103
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   104
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   105
    public void testLimitModules(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   106
        Path modules = base.resolve("modules");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   107
        new ModuleBuilder(tb, "m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   108
                .exports("pkg1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   109
                .classes("package pkg1; public class C1 { }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   110
                .build(modules);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   111
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   112
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   113
        new ModuleBuilder(tb, "m2")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   114
                .requires("m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   115
                .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   116
                .write(src);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   117
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   118
        // This is the control, to verify that by default, the module being compiled will
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   119
        // be able to read modules on the module path
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   120
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   121
                .testOpts("--module-path", modules.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   122
                .otherOpts("--module-source-path", src.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   123
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   124
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   125
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   126
        // This is the test, to verify that the module being compiled will not be able to read
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   127
        // modules on the module path when a --limit-modules is used
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   128
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   129
                .testOpts("--module-path", modules.toString(), "--limit-modules", "jdk.compiler")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   130
                .otherOpts("-XDrawDiagnostics",
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   131
                        "--module-source-path", src.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   132
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   133
                .expect(Task.Expect.FAIL, "compiler.err.module.not.found")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   134
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   135
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   136
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   137
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   138
     * Tests that a module being compiled can see another module on the module path
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   139
     * using --module-path.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   140
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   141
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   142
    public void testModulePath(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   143
        Path modules = base.resolve("modules");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   144
        new ModuleBuilder(tb, "m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   145
                .exports("pkg1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   146
                .classes("package pkg1; public class C1 { }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   147
                .build(modules);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   148
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   149
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   150
        new ModuleBuilder(tb, "m2")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   151
                .requires("m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   152
                .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   153
                .write(src);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   154
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   155
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   156
                .testOpts("--module-path", modules.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   157
                .otherOpts("--module-source-path", src.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   158
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   159
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   160
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   161
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   162
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   163
     * Tests that a module being compiled can see classes patches into an existing module
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   164
     * with --patch-module
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   165
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   166
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   167
    public void testPatchModule(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   168
        Path patchSrc = base.resolve("patchSrc");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   169
        tb.writeJavaFiles(patchSrc,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   170
                "package java.util; public class Xyzzy { }");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   171
        Path patch = base.resolve("patch");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   172
        Files.createDirectories(patch);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   173
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   174
        new JavacTask(tb)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   175
                .options("-Xmodule:java.base")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   176
                .outdir(patch)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   177
                .sourcepath(patchSrc)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   178
                .files(findJavaFiles(patchSrc))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   179
                .run()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   180
                .writeAll();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   181
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   182
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   183
        tb.writeJavaFiles(src,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   184
                "public class C { java.util.Xyzzy x; }");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   185
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   186
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   187
                .testOpts("--patch-module", "java.base=" + patch)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   188
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   189
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   190
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   191
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   192
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   193
     * Tests that options in @files are also effective.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   194
     * The test is similar to testModulePath, except that the test options are provided in an @-file.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   195
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   196
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   197
    public void testAtFile(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   198
        Path modules = base.resolve("modules");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   199
        new ModuleBuilder(tb, "m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   200
                .exports("pkg1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   201
                .classes("package pkg1; public class C1 { }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   202
                .build(modules);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   203
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   204
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   205
        new ModuleBuilder(tb, "m2")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   206
                .requires("m1")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   207
                .classes("package pkg2; public class C2 { pkg1.C1 c1; }")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   208
                .write(src);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   209
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   210
        Path atFile = base.resolve("atFile");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   211
        tb.writeFile(atFile, "--module-path " + modules);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   212
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   213
        new TestCase(base)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   214
                .testOpts("@" + atFile)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   215
                .otherOpts("--module-source-path", src.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   216
                .files(findJavaFiles(src))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   217
                .run();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   218
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   219
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   220
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   221
     * Tests that --inherit-runtime-environment works in conjunction with
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   222
     * environment variables.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   223
     * This is a variant of testAddExports.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   224
     * The use of environment variables is sufficiently custom that it is
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   225
     * not easy to do this directly with a simple TestCase.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   226
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   227
    @Test
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   228
    public void testEnvVars(Path base) throws Exception {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   229
        Path src = base.resolve("src");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   230
        tb.writeJavaFiles(src,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   231
                "class C { com.sun.tools.javac.main.Main main; }");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   232
        List<String> testOpts =
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   233
                Arrays.asList("--add-exports", "jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   234
        List<Path> files = Arrays.asList(findJavaFiles(src));
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   235
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   236
        String envName = "_JAVAC_OPTIONS";
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   237
        String envValue = String.join(" ", testOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   238
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   239
        out.println("  javac:");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   240
        Path javacOutDir = base.resolve("out-javac");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   241
        Files.createDirectories(javacOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   242
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   243
        out.println("    env: " + envName + "=" + envValue);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   244
        out.println("    outdir: " + javacOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   245
        out.println("    files: " + files);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   246
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   247
        new JavacTask(tb, Task.Mode.EXEC)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   248
                .envVar(envName, envValue)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   249
                .outdir(javacOutDir)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   250
                .files(files)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   251
                .run()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   252
                .writeAll()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   253
                .getOutput(Task.OutputKind.DIRECT);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   254
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   255
        out.println("  java:");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   256
        Path javaOutDir = base.resolve("out-java");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   257
        Files.createDirectories(javaOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   258
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   259
        Path atFile = base.resolve("atFile");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   260
        tb.writeFile(atFile, String.join(" ", testOpts));
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   261
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   262
        List<String> vmOpts = Arrays.asList(
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   263
                "@" + atFile,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   264
                "--module", "jdk.compiler/com.sun.tools.javac.Main"
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   265
        );
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   266
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   267
        List<String> classArgs = join(
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   268
                Arrays.asList("-d", javaOutDir.toString()),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   269
                files.stream()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   270
                        .map(p -> p.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   271
                        .collect(Collectors.toList())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   272
        );
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   273
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   274
        envValue = "--inherit-runtime-environment";
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   275
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   276
        out.println("    env: " + envName + "=" + envValue);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   277
        out.println("    vmOpts: " + vmOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   278
        out.println("    classArgs: " + classArgs);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   279
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   280
        new JavaTask(tb)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   281
                .envVar(envName, envValue)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   282
                .vmOptions(vmOpts)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   283
                .classArgs(classArgs)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   284
                .run()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   285
                .writeAll()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   286
                .getOutput(Task.OutputKind.STDERR);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   287
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   288
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   289
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   290
     * Runs javac with given test options,  first directly, and then again, specifying the
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   291
     * options to the runtime, and using --inherit-runtime-environment.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   292
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   293
    class TestCase {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   294
        final Path base;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   295
        List<String> testOpts = Collections.emptyList();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   296
        List<String> otherOpts = Collections.emptyList();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   297
        List<Path> files = Collections.emptyList();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   298
        Task.Expect expect = Task.Expect.SUCCESS;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   299
        String expectedText;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   300
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   301
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   302
         * Creates a test case, specifying a base directory for work files.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   303
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   304
        TestCase(Path base) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   305
            this.base = base;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   306
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   307
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   308
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   309
         * Set the "test options" to be passed to javac or to the runtime.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   310
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   311
        TestCase testOpts(String... testOpts) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   312
            this.testOpts = Arrays.asList(testOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   313
            return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   314
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   315
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   316
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   317
         * Sets additional options required for the compilation.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   318
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   319
        TestCase otherOpts(String... otherOpts) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   320
            this.otherOpts = Arrays.asList(otherOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   321
            return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   322
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   323
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   324
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   325
         * Sets the files to be compiled.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   326
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   327
        TestCase files(Path... files) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   328
            this.files = Arrays.asList(files);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   329
            return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   330
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   331
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   332
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   333
         * Sets the expected output, and any expected output from javac.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   334
         * The default is {@code Expect.SUCCESS} and no specific output expected.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   335
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   336
        TestCase expect(Task.Expect expect, String expectedText) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   337
            this.expect = expect;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   338
            this.expectedText = expectedText;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   339
            return this;
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   340
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   341
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   342
        /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   343
         * Runs the test case.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   344
         * First, javac is run passing the test options directly to javac.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   345
         * Then, javac is run again, passing the test options to the runtime,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   346
         * and using --inherit-runtime-environment.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   347
         */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   348
        void run() throws IOException {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   349
            runJavac();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   350
            runJava();
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   351
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   352
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   353
        private void runJavac() throws IOException {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   354
            out.println("  javac:");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   355
            Path javacOutDir = base.resolve("out-javac");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   356
            Files.createDirectories(javacOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   357
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   358
            List<String> options = join(testOpts, otherOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   359
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   360
            out.println("    options: " + options);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   361
            out.println("    outdir: " + javacOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   362
            out.println("    files: " + files);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   363
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   364
            String log = new JavacTask(tb, Task.Mode.CMDLINE)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   365
                    .options(options)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   366
                    .outdir(javacOutDir)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   367
                    .files(files)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   368
                    .run(expect)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   369
                    .writeAll()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   370
                    .getOutput(Task.OutputKind.DIRECT);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   371
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   372
            if (expectedText != null && !log.contains(expectedText))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   373
                error("expected text not found");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   374
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   375
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   376
        private void runJava() throws IOException {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   377
            out.println("  java:");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   378
            Path javaOutDir = base.resolve("out-java");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   379
            Files.createDirectories(javaOutDir);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   380
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   381
            List<String> vmOpts = join(
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   382
                    testOpts,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   383
                    Arrays.asList("--module", "jdk.compiler/com.sun.tools.javac.Main")
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   384
            );
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   385
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   386
            List<String> classArgs = join(
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   387
                    Arrays.asList("--inherit-runtime-environment",
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   388
                            "-d", javaOutDir.toString()),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   389
                    otherOpts,
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   390
                    files.stream()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   391
                            .map(p -> p.toString())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   392
                            .collect(Collectors.toList())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   393
            );
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   394
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   395
            out.println("    vmOpts: " + vmOpts);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   396
            out.println("    classArgs: " + classArgs);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   397
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   398
            String log = new JavaTask(tb)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   399
                    .vmOptions(vmOpts)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   400
                    .classArgs(classArgs)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   401
                    .run(expect)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   402
                    .writeAll()
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   403
                    .getOutput(Task.OutputKind.STDERR);
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   404
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   405
            if (expectedText != null && !log.contains(expectedText))
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   406
                error("expected text not found");
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   407
        }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   408
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   409
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   410
    /**
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   411
     * Join a series of lists.
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   412
     */
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   413
    @SafeVarargs
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   414
    private <T> List<T> join(List<T>... lists) {
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   415
        return Arrays.stream(lists)
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   416
            .flatMap(list -> list.stream())
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   417
            .collect(Collectors.toList());
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   418
    }
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   419
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   420
}
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents:
diff changeset
   421