More test clean-ups

jerboaa · Dec 12, 2024 · 9ba004c · 9ba004c
1 parent bb69989
commit 9ba004c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git 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
@@ -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;
         }