fix: patch diff_test with runfiles fix

publish-to-bcr-dev · Jul 15, 2022 · d0a8974 · d0a8974
1 parent 6a29def
commit d0a8974
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/lib/private/diff_test.bzl b/lib/private/diff_test.bzl
@@ -70,9 +70,14 @@ for /F "tokens=2* usebackq" %%i in (`findstr.exe /l /c:"!F1! " "%MF%"`) do (
   set RF1=!RF1:/=\\!
 )
 if "!RF1!" equ "" (
-  if exist "{file1}" (
-    set RF1="{file1}"
-    set RF1=!RF1:/=\\!
+  if "%RUNFILES_MANIFEST_ONLY%" neq "1" if exist "%RUNFILES_DIR%\\%F1%" (
+    set RF1="%RUNFILES_DIR%\\%F1%"
+  ) else (
+    if exist "{file1}" (
+      set RF1="{file1}"
+    )
+  )
+  if "!RF1!" neq "" (    set RF1=!RF1:/=\\!
   ) else (
     echo>&2 ERROR: !F1! not found
     exit /b 1
@@ -83,9 +88,14 @@ for /F "tokens=2* usebackq" %%i in (`findstr.exe /l /c:"!F2! " "%MF%"`) do (
   set RF2=!RF2:/=\\!
 )
 if "!RF2!" equ "" (
-  if exist "{file2}" (
-    set RF2="{file2}"
-    set RF2=!RF2:/=\\!
+  if "%RUNFILES_MANIFEST_ONLY%" neq "1" if exist "%RUNFILES_DIR%\\%F2%" (
+    set RF2="%RUNFILES_DIR%\\%F2%"
+  ) else (
+    if exist "{file2}" (
+      set RF2="{file2}"
+    )
+  )
+  if "!RF2!" neq "" (    set RF2=!RF2:/=\\!
   ) else (
     echo>&2 ERROR: !F2! not found
     exit /b 1