From 41cba94bb41b49cfc5c20c0093ebdbf969ebaef6 Mon Sep 17 00:00:00 2001
From: Babneet Singh <sbabneet@ca.ibm.com>
Date: Wed, 9 Feb 2022 08:24:59 -0800
Subject: [PATCH] Use the "default" directory to access J9's libjvm

Workaround for eclipse-openj9/openj9#14397.

Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
---
 test/lib/jdk/test/lib/Platform.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 7df5c2cbe91..0b4a0e178b3 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -364,7 +364,11 @@ public static Path libDir(Path image) {
      * Returns absolute path to directory containing JVM shared library.
      */
     public static Path jvmLibDir() {
-        return libDir().resolve(variant());
+        if (isJ9()) {
+            return libDir().resolve("default");
+	} else {
+            return libDir().resolve(variant());
+        }
     }
 
     private static String variant() {