--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/PatchModule/TwoJars.java 2019-07-24 08:27:35.501468784 -0400 +++ /dev/null 2019-07-22 09:37:15.068007775 -0400 @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2016, 2018, 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 - * @requires vm.cds - * @summary a patched class found in --patch-module should be used at runtime - * @library ../.. - * @library /test/hotspot/jtreg/testlibrary - * @library /test/lib - * @modules java.base/jdk.internal.misc - * jdk.jartool/sun.tools.jar - * @build PatchMain - * @run driver TwoJars - */ - -import java.io.File; -import jdk.test.lib.compiler.InMemoryJavaCompiler; -import jdk.test.lib.process.OutputAnalyzer; - -public class TwoJars { - private static String moduleJar; - private static String moduleJar2; - - public static void main(String args[]) throws Throwable { - - // Create a class file in the module java.naming. This class file - // will be put in the javanaming.jar file. - String source = "package javax.naming.spi; " + - "public class NamingManager { " + - " static { " + - " System.out.println(\"I pass!\"); " + - " } " + - "}"; - - // Create a class file in the module java.naming. This class file - // will be put in the javanaming2.jar file. - String source2 = "package javax.naming.spi; " + - "public class DirectoryManager { " + - " static { " + - " System.out.println(\"I fail!\"); " + - " } " + - "}"; - - ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", - InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "--patch-module=java.naming"), - System.getProperty("test.classes")); - - // Build the jar file that will be used for the module "java.naming". - JarBuilder.build("javanaming", "javax/naming/spi/NamingManager"); - moduleJar = TestCommon.getTestJar("javanaming.jar"); - - ClassFileInstaller.writeClassToDisk("javax/naming/spi/DirectoryManager", - InMemoryJavaCompiler.compile("javax.naming.spi.DirectoryManager", source2, "--patch-module=java.naming"), - System.getProperty("test.classes")); - - // Build the jar file that will be used for the module "java.naming". - JarBuilder.build("javanaming2", "javax/naming/spi/DirectoryManager"); - moduleJar2 = TestCommon.getTestJar("javanaming2.jar"); - - System.out.println("Test dumping with --patch-module"); - OutputAnalyzer output = - TestCommon.dump(null, - TestCommon.list("javax/naming/spi/NamingManager"), - "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar, - "-Xlog:class+load", - "-Xlog:class+path=info", - "PatchMain", "javax.naming.spi.NamingManager"); - output.shouldHaveExitValue(1) - .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module"); - - TestCommon.run( - "-XX:+UnlockDiagnosticVMOptions", - "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar, - "-Xlog:class+load", - "-Xlog:class+path=info", - "PatchMain", "javax.naming.spi.NamingManager") - .assertSilentlyDisabledCDS(0, "I pass!"); - } -} --- /dev/null 2019-07-22 09:37:15.068007775 -0400 +++ new/test/hotspot/jtreg/runtime/cds/jigsaw/PatchModule/TwoJars.java 2019-07-24 08:27:35.161468796 -0400 @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2016, 2018, 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 + * @requires vm.cds + * @summary a patched class found in --patch-module should be used at runtime + * @library ../.. + * @library /test/hotspot/jtreg/testlibrary + * @library /test/lib + * @modules java.base/jdk.internal.misc + * jdk.jartool/sun.tools.jar + * @build PatchMain + * @run driver TwoJars + */ + +import java.io.File; +import jdk.test.lib.compiler.InMemoryJavaCompiler; +import jdk.test.lib.process.OutputAnalyzer; + +public class TwoJars { + private static String moduleJar; + private static String moduleJar2; + + public static void main(String args[]) throws Throwable { + + // Create a class file in the module java.naming. This class file + // will be put in the javanaming.jar file. + String source = "package javax.naming.spi; " + + "public class NamingManager { " + + " static { " + + " System.out.println(\"I pass!\"); " + + " } " + + "}"; + + // Create a class file in the module java.naming. This class file + // will be put in the javanaming2.jar file. + String source2 = "package javax.naming.spi; " + + "public class DirectoryManager { " + + " static { " + + " System.out.println(\"I fail!\"); " + + " } " + + "}"; + + ClassFileInstaller.writeClassToDisk("javax/naming/spi/NamingManager", + InMemoryJavaCompiler.compile("javax.naming.spi.NamingManager", source, "--patch-module=java.naming"), + System.getProperty("test.classes")); + + // Build the jar file that will be used for the module "java.naming". + JarBuilder.build("javanaming", "javax/naming/spi/NamingManager"); + moduleJar = TestCommon.getTestJar("javanaming.jar"); + + ClassFileInstaller.writeClassToDisk("javax/naming/spi/DirectoryManager", + InMemoryJavaCompiler.compile("javax.naming.spi.DirectoryManager", source2, "--patch-module=java.naming"), + System.getProperty("test.classes")); + + // Build the jar file that will be used for the module "java.naming". + JarBuilder.build("javanaming2", "javax/naming/spi/DirectoryManager"); + moduleJar2 = TestCommon.getTestJar("javanaming2.jar"); + + System.out.println("Test dumping with --patch-module"); + OutputAnalyzer output = + TestCommon.dump(null, + TestCommon.list("javax/naming/spi/NamingManager"), + "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar, + "-Xlog:class+load", + "-Xlog:class+path=info", + "PatchMain", "javax.naming.spi.NamingManager"); + output.shouldHaveExitValue(1) + .shouldContain("Cannot use the following option when dumping the shared archive: --patch-module"); + + TestCommon.run( + "-XX:+UnlockDiagnosticVMOptions", + "--patch-module=java.naming=" + moduleJar2 + File.pathSeparator + moduleJar, + "-Xlog:class+load", + "-Xlog:class+path=info", + "PatchMain", "javax.naming.spi.NamingManager") + .assertSilentlyDisabledCDS(0, "I pass!"); + } +}