stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8294979: test/jdk/tools/jlink 3 test classes use ASM library

Browse Source 
Reviewed-by: mchung, ksakata
This commit is contained in:
Qing Xiao 2023-08-04 05:13:57 +00:00 committed by Koichi Sakata
parent e8c325dea3
commit 10a2605884
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/jdk/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java
View File

@ -86,12 +86,10 @@ public class CompiledVersionTest {
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));
}

1
test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
View File

@ -44,7 +44,6 @@ import static org.testng.Assert.*;
* @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

9
test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
View File

@ -47,7 +47,6 @@ import static org.testng.Assert.*;
* @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
@ -89,8 +88,7 @@ public class UserModuleTest {
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)) {
@ -113,7 +111,6 @@ public class UserModuleTest {
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)
@ -145,7 +142,6 @@ public class UserModuleTest {
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)
@ -166,7 +162,6 @@ public class UserModuleTest {
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)
@ -262,7 +257,6 @@ public class UserModuleTest {
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)
@ -292,7 +286,6 @@ public class UserModuleTest {
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)