diff options
| author | Thaler Benedek <erenon2@gmail.com> | 2021-09-24 16:49:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:49:07 -0400 |
| commit | 43a545a67ea2b9673365745b1b5372170d730922 (patch) | |
| tree | 46b8298c75aeed32b291f29a79e582fbc7032172 | |
| parent | 14f17ae7f71f347b5e720fca55e33df40bc4e5d5 (diff) | |
| download | bazel-skylib-43a545a67ea2b9673365745b1b5372170d730922.tar.gz | |
Make diff_test work on windows with --enable_runfiles (#314)
| -rw-r--r-- | rules/diff_test.bzl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/rules/diff_test.bzl b/rules/diff_test.bzl index acde2ea..ff570e6 100644 --- a/rules/diff_test.bzl +++ b/rules/diff_test.bzl @@ -44,16 +44,26 @@ for /F "tokens=2* usebackq" %%i in (`findstr.exe /l /c:"!F1! " "%MF%"`) do ( set RF1=!RF1:/=\\! ) if "!RF1!" equ "" ( - echo>&2 ERROR: !F1! not found - exit /b 1 + if exist "{file1}" ( + set RF1="{file1}" + set RF1=!RF1:/=\\! + ) else ( + echo>&2 ERROR: !F1! not found + exit /b 1 + ) ) for /F "tokens=2* usebackq" %%i in (`findstr.exe /l /c:"!F2! " "%MF%"`) do ( set RF2=%%i set RF2=!RF2:/=\\! ) if "!RF2!" equ "" ( - echo>&2 ERROR: !F2! not found - exit /b 1 + if exist "{file2}" ( + set RF2="{file2}" + set RF2=!RF2:/=\\! + ) else ( + echo>&2 ERROR: !F2! not found + exit /b 1 + ) ) fc.exe 2>NUL 1>NUL /B "!RF1!" "!RF2!" if %ERRORLEVEL% neq 0 ( |