Skip to content

Commit

Permalink
8294979: test/jdk/tools/jlink 3 test classes use ASM library
Browse files Browse the repository at this point in the history 
Reviewed-by: mchung, ksakata
  • Loading branch information
@xqoasis @jyukutyo
xqoasis authored and jyukutyo committed Aug 4, 2023
1 parent e8c325d commit 10a2605
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions test/jdk/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,10 @@ public void compileAll() throws Throwable {
if (version.equals("0")) {
assertTrue(CompilerUtils.compile(msrc, MODS_DIR,
"--add-exports", "java.base/jdk.internal.module=m1",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1",
"--module-source-path", SRC_DIR.toString()));
} else {
assertTrue(CompilerUtils.compile(msrc, MODS_DIR,
"--add-exports", "java.base/jdk.internal.module=m1",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1",
"--module-source-path", SRC_DIR.toString(),
"--module-version", version));
}
Expand Down
1 change: 0 additions & 1 deletion test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
* @bug 8142968 8173381
* @modules java.base/jdk.internal.access
* @modules java.base/jdk.internal.module
* @modules java.base/jdk.internal.org.objectweb.asm
* @build ModuleTargetHelper
* @run testng SystemModulesTest
* @summary Verify the properties of ModuleDescriptor created
Expand Down
9 changes: 1 addition & 8 deletions test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
* @library /test/lib
* @modules jdk.compiler jdk.jlink
* @modules java.base/jdk.internal.module
* @modules java.base/jdk.internal.org.objectweb.asm
* @build jdk.test.lib.compiler.CompilerUtils
* jdk.test.lib.util.FileUtils
* jdk.test.lib.Platform
Expand Down Expand Up @@ -89,8 +88,7 @@ public void compileAll() throws Throwable {
Path msrc = SRC_DIR.resolve(mn);
assertTrue(CompilerUtils.compile(msrc, MODS_DIR,
"--module-source-path", SRC_DIR.toString(),
"--add-exports", "java.base/jdk.internal.module=" + mn,
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=" + mn));
"--add-exports", "java.base/jdk.internal.module=" + mn));
}

if (Files.exists(IMAGE)) {
Expand All @@ -113,7 +111,6 @@ public void testPackagesAttribute() throws Throwable {
Path java = IMAGE.resolve("bin").resolve("java");
assertTrue(executeProcess(java.toString(),
"--add-exports", "java.base/jdk.internal.module=m1,m4",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1,m4",
"-m", MAIN_MID)
.outputTo(System.out)
.errorTo(System.out)
Expand Down Expand Up @@ -145,7 +142,6 @@ public void disableSystemModules() throws Throwable {
Path java = IMAGE.resolve("bin").resolve("java");
assertTrue(executeProcess(java.toString(),
"--add-exports", "java.base/jdk.internal.module=m1,m4",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1,m4",
"-Djdk.system.module.finder.disabledFastPath",
"-m", MAIN_MID)
.outputTo(System.out)
Expand All @@ -166,7 +162,6 @@ public void testDedupSet() throws Throwable {
Path java = dir.resolve("bin").resolve("java");
assertTrue(executeProcess(java.toString(),
"--add-exports", "java.base/jdk.internal.module=m1,m4",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1,m4",
"-m", MAIN_MID)
.outputTo(System.out)
.errorTo(System.out)
Expand Down Expand Up @@ -262,7 +257,6 @@ public void testModulePackagesAttribute() throws Throwable {
Path java = dir.resolve("bin").resolve("java");
assertTrue(executeProcess(java.toString(),
"--add-exports", "java.base/jdk.internal.module=m1,m4",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1,m4",
"--add-modules=m1", "-m", "m4")
.outputTo(System.out)
.errorTo(System.out)
Expand Down Expand Up @@ -292,7 +286,6 @@ public void testRetainModuleTarget() throws Throwable {
Path java = dir.resolve("bin").resolve("java");
assertTrue(executeProcess(java.toString(),
"--add-exports", "java.base/jdk.internal.module=m1,m4",
"--add-exports", "java.base/jdk.internal.org.objectweb.asm=m1,m4",
"--add-modules=m1", "-m", "m4", "retainModuleTarget")
.outputTo(System.out)
.errorTo(System.out)
Expand Down

1 comment on commit 10a2605

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.