bazel
/
bazel-lib
mirror of https://github.com/bazel-contrib/bazel-lib
2
0
Fork 0
Code Issues Releases Activity

fix: patch diff_test with runfiles fix

This commit is contained in:
Derek Cormier 2022-07-15 11:26:18 -07:00
parent 6a29defd77
commit d0a897488b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/private/diff_test.bzl
View File

@ -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