Map rootpath to rlocation path in fuzz target test wrapper

1 files changed, 11 insertions, 18 deletions

diff --git a/bazel/FuzzTargetTestWrapper.java b/bazel/FuzzTargetTestWrapper.java
index 286bb86c..59b15844 100644
--- a/bazel/FuzzTargetTestWrapper.java
+++ b/bazel/FuzzTargetTestWrapper.java
@@ -28,24 +28,8 @@ public class FuzzTargetTestWrapper {
     Runfiles runfiles;
     try {
       runfiles = Runfiles.create();
-      String driverRlocation;
-      if (System.getProperty("os.name").startsWith("Windows")) {
-        driverRlocation = args[0] + ".exe";
-      } else {
-        driverRlocation = args[0];
-      }
-      driverActualPath = runfiles.rlocation(driverRlocation);
-      if (driverActualPath == null) {
-        System.err.println("driverActualPath is null, driverRlocation=" + driverRlocation);
-        System.exit(1);
-        return;
-      }
-      jarActualPath = runfiles.rlocation(args[1]);
-      if (jarActualPath == null) {
-        System.err.println("jarActualPath is null, jarRlocation=" + jarActualPath);
-        System.exit(1);
-        return;
-      }
+      driverActualPath = runfiles.rlocation(rlocationPath(args[0]));
+      jarActualPath = runfiles.rlocation(rlocationPath(args[1]));
     } catch (IOException | ArrayIndexOutOfBoundsException e) {
       e.printStackTrace();
       System.exit(1);
@@ -91,4 +75,13 @@ public class FuzzTargetTestWrapper {
     }
     System.exit(0);
   }
+
+  // Turns the result of Bazel's `$(rootpath ...)` into the correct format for rlocation.
+  private static String rlocationPath(String rootpath) {
+    if (rootpath.startsWith("external/")) {
+      return rootpath.substring("external/".length());
+    } else {
+      return "jazzer/" + rootpath;
+    }
+  }
 }