--- old/test/hotspot/jtreg/runtime/appcds/dynamicArchive/HelloDynamicCustomUnload.java 2019-07-24 08:27:20.313469313 -0400 +++ /dev/null 2019-07-22 09:37:15.068007775 -0400 @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2019, 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 Hello World test for dynamic archive with custom loader. - * Attempt will be made to unload the custom loader during - * dump time and run time. The custom loader will be unloaded - * during dump time. - * @requires vm.cds - * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/customLoader/test-classes /runtime/testlibrary - * @build HelloUnload CustomLoadee ClassUnloadCommon - * @build sun.hotspot.WhiteBox - * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure - * @run driver ClassFileInstaller -jar hello_custom.jar CustomLoadee - * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox - * @run driver HelloDynamicCustomUnload - */ - -import java.io.File; - -public class HelloDynamicCustomUnload extends DynamicArchiveTestBase { - private static final String ARCHIVE_NAME = - System.getProperty("test.classes") + File.separator + "HelloDynamicCustomUnload.jsa"; - - public static void main(String[] args) throws Exception { - runTest(HelloDynamicCustomUnload::testDefaultBase); - } - - static void testDefaultBase() throws Exception { - String topArchiveName = getNewArchiveName("HelloDynamicCustomUnload-top"); - doTest(topArchiveName); - } - - private static void doTest(String topArchiveName) throws Exception { - String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar"); - String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar; - String appJar = ClassFileInstaller.getJarPath("hello.jar"); - String customJarPath = ClassFileInstaller.getJarPath("hello_custom.jar"); - String mainAppClass = "HelloUnload"; - - dump(topArchiveName, - use_whitebox_jar, - "-XX:+UnlockDiagnosticVMOptions", - "-XX:+WhiteBoxAPI", - "-Xmn8m", - "-Xlog:cds,cds+dynamic=debug,class+unload=debug", - "-XX:ArchiveClassesAtExit=" + ARCHIVE_NAME, - "-cp", appJar, - mainAppClass, customJarPath, "true", "false") - .assertNormalExit(output -> { - output.shouldContain("Buffer-space to target-space delta") - .shouldContain("Written dynamic archive 0x") - .shouldNotContain("klasses.*=.*CustomLoadee") // Fixme -- use a better way to decide if a class has been archived - .shouldHaveExitValue(0); - }); - - run(topArchiveName, - use_whitebox_jar, - "-XX:+UnlockDiagnosticVMOptions", - "-XX:+WhiteBoxAPI", - "-Xlog:class+load,cds=debug,class+unload=debug", - "-XX:SharedArchiveFile=" + ARCHIVE_NAME, - "-cp", appJar, - mainAppClass, customJarPath, "true", "false") - .assertNormalExit(output -> { - output.shouldContain("HelloUnload source: shared objects file") - .shouldMatch(".class.load. CustomLoadee source:.*hello_custom.jar") - .shouldHaveExitValue(0); - }); - } -} --- /dev/null 2019-07-22 09:37:15.068007775 -0400 +++ new/test/hotspot/jtreg/runtime/cds/dynamicArchive/HelloDynamicCustomUnload.java 2019-07-24 08:27:19.985469324 -0400 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2019, 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 Hello World test for dynamic archive with custom loader. + * Attempt will be made to unload the custom loader during + * dump time and run time. The custom loader will be unloaded + * during dump time. + * @requires vm.cds + * @library /test/lib /test/hotspot/jtreg/runtime/cds /test/hotspot/jtreg/runtime/cds/customLoader/test-classes /runtime/testlibrary + * @build HelloUnload CustomLoadee ClassUnloadCommon + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure + * @run driver ClassFileInstaller -jar hello_custom.jar CustomLoadee + * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox + * @run driver HelloDynamicCustomUnload + */ + +import java.io.File; + +public class HelloDynamicCustomUnload extends DynamicArchiveTestBase { + private static final String ARCHIVE_NAME = + System.getProperty("test.classes") + File.separator + "HelloDynamicCustomUnload.jsa"; + + public static void main(String[] args) throws Exception { + runTest(HelloDynamicCustomUnload::testDefaultBase); + } + + static void testDefaultBase() throws Exception { + String topArchiveName = getNewArchiveName("HelloDynamicCustomUnload-top"); + doTest(topArchiveName); + } + + private static void doTest(String topArchiveName) throws Exception { + String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar"); + String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar; + String appJar = ClassFileInstaller.getJarPath("hello.jar"); + String customJarPath = ClassFileInstaller.getJarPath("hello_custom.jar"); + String mainAppClass = "HelloUnload"; + + dump(topArchiveName, + use_whitebox_jar, + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+WhiteBoxAPI", + "-Xmn8m", + "-Xlog:cds,cds+dynamic=debug,class+unload=debug", + "-XX:ArchiveClassesAtExit=" + ARCHIVE_NAME, + "-cp", appJar, + mainAppClass, customJarPath, "true", "false") + .assertNormalExit(output -> { + output.shouldContain("Buffer-space to target-space delta") + .shouldContain("Written dynamic archive 0x") + .shouldNotContain("klasses.*=.*CustomLoadee") // Fixme -- use a better way to decide if a class has been archived + .shouldHaveExitValue(0); + }); + + run(topArchiveName, + use_whitebox_jar, + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+WhiteBoxAPI", + "-Xlog:class+load,cds=debug,class+unload=debug", + "-XX:SharedArchiveFile=" + ARCHIVE_NAME, + "-cp", appJar, + mainAppClass, customJarPath, "true", "false") + .assertNormalExit(output -> { + output.shouldContain("HelloUnload source: shared objects file") + .shouldMatch(".class.load. CustomLoadee source:.*hello_custom.jar") + .shouldHaveExitValue(0); + }); + } +}