Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jun 24, 2020
2 parents 6c2afd7 + 1e45eb3 commit 469a93691691926c361bc0623993a646a13587fa
Showing with 15 additions and 12 deletions.
  1. +15 −12 test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java
@@ -33,6 +33,7 @@
* @run driver Simple
*/

import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.compiler.InMemoryJavaCompiler;
import jdk.test.lib.process.OutputAnalyzer;

@@ -78,18 +79,20 @@ public static void main(String args[]) throws Throwable {
.assertSilentlyDisabledCDS(0, "I pass!");

// ========================================
System.out.println("Dump again without --patch-module");
output =
TestCommon.dump(null,
TestCommon.list("javax/naming/spi/NamingManager"));
output.shouldHaveExitValue(0);
if (!CDSTestUtils.DYNAMIC_DUMP) {
System.out.println("Dump again without --patch-module");
output =
TestCommon.dump(null,
TestCommon.list("javax/naming/spi/NamingManager"));
output.shouldHaveExitValue(0);

TestCommon.run(
"-XX:+UnlockDiagnosticVMOptions",
"--patch-module=java.naming=" + moduleJar,
"-Xlog:class+load",
"-Xlog:class+path=info",
"PatchMain", "javax.naming.spi.NamingManager")
.assertSilentlyDisabledCDS(0, "I pass!");
TestCommon.run(
"-XX:+UnlockDiagnosticVMOptions",
"--patch-module=java.naming=" + moduleJar,
"-Xlog:class+load",
"-Xlog:class+path=info",
"PatchMain", "javax.naming.spi.NamingManager")
.assertSilentlyDisabledCDS(0, "I pass!");
}
}
}

0 comments on commit 469a936

Please sign in to comment.