--- old/test/hotspot/jtreg/runtime/appcds/DumpClassList.java 2019-07-24 08:26:26.065471203 -0400 +++ /dev/null 2019-07-22 09:37:15.068007775 -0400 @@ -1,102 +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 - * @summary DumpLoadedClassList should exclude generated classes, classes in bootclasspath/a and - * --patch-module. - * @requires vm.cds - * @library /test/lib - * @modules java.base/jdk.internal.misc - * jdk.jartool/sun.tools.jar - * @compile test-classes/ArrayListTest.java - * @run driver DumpClassList - */ - -import jdk.test.lib.compiler.InMemoryJavaCompiler; -import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.process.ProcessTools; - -public class DumpClassList { - public static void main(String[] args) throws Exception { - // build The app - String[] appClass = new String[] {"ArrayListTest"}; - String classList = "app.list"; - - JarBuilder.build("app", appClass[0]); - String appJar = TestCommon.getTestJar("app.jar"); - - // build patch-module - String source = "package java.lang; " + - "public class NewClass { " + - " static { " + - " System.out.println(\"NewClass\"); "+ - " } " + - "}"; - - ClassFileInstaller.writeClassToDisk("java/lang/NewClass", - InMemoryJavaCompiler.compile("java.lang.NewClass", source, "--patch-module=java.base"), - System.getProperty("test.classes")); - - String patchJar = JarBuilder.build("javabase", "java/lang/NewClass"); - - // build bootclasspath/a - String source2 = "package boot.append; " + - "public class Foo { " + - " static { " + - " System.out.println(\"Foo\"); " + - " } " + - "}"; - - ClassFileInstaller.writeClassToDisk("boot/append/Foo", - InMemoryJavaCompiler.compile("boot.append.Foo", source2), - System.getProperty("test.classes")); - - String appendJar = JarBuilder.build("bootappend", "boot/append/Foo"); - - // dump class list - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( - true, - "-XX:DumpLoadedClassList=" + classList, - "--patch-module=java.base=" + patchJar, - "-Xbootclasspath/a:" + appendJar, - "-cp", - appJar, - appClass[0]); - OutputAnalyzer output = TestCommon.executeAndLog(pb, "dumpClassList"); - TestCommon.checkExecReturn(output, 0, true, - "hello world", - "skip writing class java/lang/NewClass") // skip classes outside of jrt image - .shouldNotContain("skip writing class boot/append/Foo"); // but classes on -Xbootclasspath/a should not be skipped - - output = TestCommon.createArchive(appJar, appClass, - "-Xbootclasspath/a:" + appendJar, - "-Xlog:class+load", - "-XX:SharedClassListFile=" + classList); - TestCommon.checkDump(output) - .shouldNotContain("Preload Warning: Cannot find java/lang/invoke/LambdaForm") - .shouldNotContain("Preload Warning: Cannot find boot/append/Foo") - .shouldContain("[info][class,load] boot.append.Foo"); - } -} --- /dev/null 2019-07-22 09:37:15.068007775 -0400 +++ new/test/hotspot/jtreg/runtime/cds/DumpClassList.java 2019-07-24 08:26:25.769471213 -0400 @@ -0,0 +1,102 @@ +/* + * 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 + * @summary DumpLoadedClassList should exclude generated classes, classes in bootclasspath/a and + * --patch-module. + * @requires vm.cds + * @library /test/lib + * @modules java.base/jdk.internal.misc + * jdk.jartool/sun.tools.jar + * @compile test-classes/ArrayListTest.java + * @run driver DumpClassList + */ + +import jdk.test.lib.compiler.InMemoryJavaCompiler; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +public class DumpClassList { + public static void main(String[] args) throws Exception { + // build The app + String[] appClass = new String[] {"ArrayListTest"}; + String classList = "app.list"; + + JarBuilder.build("app", appClass[0]); + String appJar = TestCommon.getTestJar("app.jar"); + + // build patch-module + String source = "package java.lang; " + + "public class NewClass { " + + " static { " + + " System.out.println(\"NewClass\"); "+ + " } " + + "}"; + + ClassFileInstaller.writeClassToDisk("java/lang/NewClass", + InMemoryJavaCompiler.compile("java.lang.NewClass", source, "--patch-module=java.base"), + System.getProperty("test.classes")); + + String patchJar = JarBuilder.build("javabase", "java/lang/NewClass"); + + // build bootclasspath/a + String source2 = "package boot.append; " + + "public class Foo { " + + " static { " + + " System.out.println(\"Foo\"); " + + " } " + + "}"; + + ClassFileInstaller.writeClassToDisk("boot/append/Foo", + InMemoryJavaCompiler.compile("boot.append.Foo", source2), + System.getProperty("test.classes")); + + String appendJar = JarBuilder.build("bootappend", "boot/append/Foo"); + + // dump class list + ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( + true, + "-XX:DumpLoadedClassList=" + classList, + "--patch-module=java.base=" + patchJar, + "-Xbootclasspath/a:" + appendJar, + "-cp", + appJar, + appClass[0]); + OutputAnalyzer output = TestCommon.executeAndLog(pb, "dumpClassList"); + TestCommon.checkExecReturn(output, 0, true, + "hello world", + "skip writing class java/lang/NewClass") // skip classes outside of jrt image + .shouldNotContain("skip writing class boot/append/Foo"); // but classes on -Xbootclasspath/a should not be skipped + + output = TestCommon.createArchive(appJar, appClass, + "-Xbootclasspath/a:" + appendJar, + "-Xlog:class+load", + "-XX:SharedClassListFile=" + classList); + TestCommon.checkDump(output) + .shouldNotContain("Preload Warning: Cannot find java/lang/invoke/LambdaForm") + .shouldNotContain("Preload Warning: Cannot find boot/append/Foo") + .shouldContain("[info][class,load] boot.append.Foo"); + } +}