Try to find out where Windows jvm.dll really is

Author: jcflack

CI/integration

@@ -83,6 +83,7 @@ UnaryOperator<ProcessBuilder> tweaks =
   redirectError ? p -> p.redirectErrorStream(true) : UnaryOperator.identity();
 
 import static java.nio.file.Files.createTempFile;
+import static java.nio.file.Files.walk;
 import static java.nio.file.Files.write;
 import java.nio.file.Path;
 import static java.nio.file.Paths.get;
@@ -114,16 +115,28 @@ import com.sun.net.httpserver.HttpServer;
 if ( Boolean.getBoolean("extractFiles") )
   Node.main(new String[0]); // extract the files
 
-String javaHome = System.getProperty("java.home");
-
-Path javaLibDir = get(javaHome, s_isWindows ? "bin" : "lib");
+Path javaHome = get(System.getProperty("java.home"));
+
+Path libjvmHunt() { // on Windows, location seems to have been inconsistent
+  Path target = get("jvm.dll");
+  return
+    Stream.of("bin", "lib").map(javaHome::resolve).flatMap(r -> {
+      try {
+        return walk(r, 2);
+      }
+      catch ( IOException e ) {
+        throw new UncheckedIOException(e);
+      }
+    })
+    .filter(p -> p.endsWith(target)).findFirst().get();
+}
 
 Path libjvm = (
   "Mac OS X".equals(System.getProperty("os.name"))
-  ? Stream.of("libjli.dylib", "jli/libjli.dylib")
-    .map(s -> javaLibDir.resolve(s))
+  ? Stream.of("lib/libjli.dylib", "lib/jli/libjli.dylib")
+    .map(s -> javaHome.resolve(s))
     .filter(Files::exists).findFirst().get()
-  : javaLibDir.resolve(s_isWindows ? "jvm.dll" : "server/libjvm.so")
+  : s_isWindows ? libjvmHunt() : javaHome.resolve("lib/server/libjvm.so")
 );
 
 // Use deprecated major() here because feature() first appears in Java 10
@@ -347,7 +360,7 @@ try (
         "  END"
       );
 
-      tryForbiddenRead.setString(1, javaHome);
+      tryForbiddenRead.setString(1, javaHome.toString());
 
       succeeding &= stateMachine(
         "try to read a forbidden property",