From 9ba004cce07312c67c4ae33123a223ade0d7ed82 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Thu, 12 Dec 2024 17:27:03 +0100
Subject: [PATCH] More test clean-ups
---
test/jdk/tools/jlink/basic/AllModulePath.java | 2 +-
test/jdk/tools/jlink/basic/BasicTest.java | 14 ++++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/test/jdk/tools/jlink/basic/AllModulePath.java b/test/jdk/tools/jlink/basic/AllModulePath.java
index 1ebc9bb002f52..e2ec073f15fc8 100644
--- a/test/jdk/tools/jlink/basic/AllModulePath.java
+++ b/test/jdk/tools/jlink/basic/AllModulePath.java
@@ -63,7 +63,7 @@
* @build jdk.test.lib.process.ProcessTools
* jdk.test.lib.process.OutputAnalyzer
* jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm -Duser.lang=en -Duser.country=US AllModulePath
+ * @run testng/othervm -Duser.language=en -Duser.country=US AllModulePath
*/
public class AllModulePath {
diff --git a/test/jdk/tools/jlink/basic/BasicTest.java b/test/jdk/tools/jlink/basic/BasicTest.java
index d5ced9bf768d1..e635abd8ebf49 100644
--- a/test/jdk/tools/jlink/basic/BasicTest.java
+++ b/test/jdk/tools/jlink/basic/BasicTest.java
@@ -77,18 +77,16 @@ public static void main(String[] args) throws Throwable {
new BasicTest().run();
}
- private static boolean isApplicable() {
- if (!JMODS_EXIST) {
- if (!LINKABLE_RUNTIME) {
- System.err.println("Test skipped. Not a linkable runtime and no JMODs");
- return false;
- }
+ private static boolean isExplodedJDKImage() {
+ if (!JMODS_EXIST && !LINKABLE_RUNTIME) {
+ System.err.println("Test skipped. Not a linkable runtime and no JMODs");
+ return true;
}
- return true;
+ return false;
}
public void run() throws Throwable {
- if (!isApplicable()) {
+ if (isExplodedJDKImage()) {
return;
}