Make diff_test work on windows with --enable_runfiles (#314)
This commit is contained in:
parent
14f17ae7f7
commit
43a545a67e
|
@ -44,17 +44,27 @@ 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:/=\\!
|
||||
) 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 "" (
|
||||
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 (
|
||||
if %ERRORLEVEL% equ 1 (
|
||||
|
|
Loading…
Reference in New Issue