8273487: Zero: Handle "zero" variant in runtime tests

Backport-of: 8c16f485b341ee3071c91df39dfb9ba8b9caa44d
openjdk · Oct 5, 2021 · 09370c3 · 09370c3 · openjdk-notifier · Oct 5, 2021
1 parent 328358a
commit 09370c3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
@@ -364,6 +364,11 @@ private static String variant() {
             return "client";
         } else if (Platform.isMinimal()) {
             return "minimal";
+        } else if (Platform.isZero()) {
+            // This name is used to search for libjvm.so. Weirdly, current
+            // build system puts libjvm.so into default location, which is
+            // "server". See JDK-8273494.
+            return "server";
         } else {
             throw new Error("TESTBUG: unsupported vm variant");
         }