8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
|
|
|
/**
|
|
|
|
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
|
*
|
|
|
|
* This code is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
|
* accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License version
|
|
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
|
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
|
|
* questions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @test
|
|
|
|
* @summary Basic test of jlink to create jmods and images
|
|
|
|
* @author Andrei Eremeev
|
|
|
|
* @library /lib/testlibrary
|
|
|
|
* @modules java.base/jdk.internal.module
|
|
|
|
* jdk.jlink/jdk.tools.jlink.internal
|
|
|
|
* jdk.jlink/jdk.tools.jmod
|
|
|
|
* jdk.compiler
|
|
|
|
* @build jdk.testlibrary.ProcessTools
|
|
|
|
* jdk.testlibrary.OutputAnalyzer
|
|
|
|
* JarUtils CompilerUtils
|
|
|
|
* @run main BasicTest
|
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
import java.io.PrintWriter;
|
|
|
|
import java.nio.file.Files;
|
|
|
|
import java.nio.file.Path;
|
|
|
|
import java.nio.file.Paths;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import jdk.testlibrary.OutputAnalyzer;
|
|
|
|
import jdk.testlibrary.ProcessTools;
|
|
|
|
|
|
|
|
public class BasicTest {
|
|
|
|
|
|
|
|
private final Path jdkHome = Paths.get(System.getProperty("test.jdk"));
|
|
|
|
private final Path jdkMods = jdkHome.resolve("jmods");
|
|
|
|
private final Path testSrc = Paths.get(System.getProperty("test.src"));
|
|
|
|
private final Path src = testSrc.resolve("src");
|
|
|
|
private final Path classes = Paths.get("classes");
|
|
|
|
private final Path jmods = Paths.get("jmods");
|
|
|
|
private final Path jars = Paths.get("jars");
|
|
|
|
|
|
|
|
public static void main(String[] args) throws Throwable {
|
|
|
|
new BasicTest().run();
|
|
|
|
}
|
|
|
|
|
|
|
|
public void run() throws Throwable {
|
|
|
|
if (Files.notExists(jdkMods)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!CompilerUtils.compile(src, classes)) {
|
|
|
|
throw new AssertionError("Compilation failure. See log.");
|
|
|
|
}
|
|
|
|
|
|
|
|
String modName = "test";
|
|
|
|
Files.createDirectories(jmods);
|
|
|
|
Files.createDirectories(jars);
|
|
|
|
Path jarfile = jars.resolve("test.jar");
|
|
|
|
JarUtils.createJarFile(jarfile, classes);
|
|
|
|
|
|
|
|
Path image = Paths.get("mysmallimage");
|
|
|
|
runJmod(jarfile.toString(), modName);
|
|
|
|
runJlink(image, modName, "--compress", "2");
|
|
|
|
execute(image, modName);
|
|
|
|
|
|
|
|
Files.delete(jmods.resolve(modName + ".jmod"));
|
|
|
|
|
|
|
|
image = Paths.get("myimage");
|
|
|
|
runJmod(classes.toString(), modName);
|
|
|
|
runJlink(image, modName);
|
|
|
|
execute(image, modName);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void execute(Path image, String moduleName) throws Throwable {
|
|
|
|
String cmd = image.resolve("bin").resolve(moduleName).toString();
|
|
|
|
OutputAnalyzer analyzer;
|
|
|
|
if (System.getProperty("os.name").startsWith("Windows")) {
|
|
|
|
analyzer = ProcessTools.executeProcess("sh.exe", cmd, "1", "2", "3");
|
|
|
|
} else {
|
|
|
|
analyzer = ProcessTools.executeProcess(cmd, "1", "2", "3");
|
|
|
|
}
|
|
|
|
if (analyzer.getExitValue() != 0) {
|
|
|
|
throw new AssertionError("Image invocation failed: rc=" + analyzer.getExitValue());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void runJlink(Path image, String modName, String... options) {
|
|
|
|
List<String> args = new ArrayList<>();
|
|
|
|
Collections.addAll(args,
|
2016-08-10 22:51:25 +00:00
|
|
|
"--module-path", jdkMods + File.pathSeparator + jmods,
|
|
|
|
"--add-modules", modName,
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
|
|
|
"--output", image.toString());
|
|
|
|
Collections.addAll(args, options);
|
|
|
|
int rc = jdk.tools.jlink.internal.Main.run(args.toArray(new String[args.size()]), new PrintWriter(System.out));
|
|
|
|
if (rc != 0) {
|
|
|
|
throw new AssertionError("Jlink failed: rc = " + rc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void runJmod(String cp, String modName) {
|
|
|
|
int rc = jdk.tools.jmod.Main.run(new String[] {
|
|
|
|
"create",
|
|
|
|
"--class-path", cp,
|
|
|
|
"--module-version", "1.0",
|
|
|
|
"--main-class", "jdk.test.Test",
|
|
|
|
jmods.resolve(modName + ".jmod").toString(),
|
|
|
|
}, System.out);
|
|
|
|
if (rc != 0) {
|
|
|
|
throw new AssertionError("Jmod failed: rc = " + rc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|