Some cleanup of the onetest.cmd

This commit is contained in:
Geoff McLane 2015-09-10 13:37:39 +02:00
parent 1bf5a9ad7e
commit cc7b86c945

View file

@ -1,5 +1,4 @@
@echo off @echo off
@set TMPTEST=temptest.txt
REM onetest.cmd - execute a single test case REM onetest.cmd - execute a single test case
REM REM
REM (c) 1998-2006 (W3C) MIT, ERCIM, Keio University REM (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
@ -13,6 +12,8 @@ REM
@if "%TIDYOUT%." == "." goto Err3 @if "%TIDYOUT%." == "." goto Err3
@if NOT EXIST %TIDYOUT%\nul goto Err4 @if NOT EXIST %TIDYOUT%\nul goto Err4
@if NOT EXIST input\nul goto Err5 @if NOT EXIST input\nul goto Err5
@if "%TMPTEST%x" == "x" goto Err10
@if "%1x" == "x" goto Err8 @if "%1x" == "x" goto Err8
@if "%2x" == "x" goto Err9 @if "%2x" == "x" goto Err9
@ -46,8 +47,8 @@ if exist %TIDYFILE% del %TIDYFILE%
@%TIDY% -f %MSGFILE% -config %CFGFILE% %3 %4 %5 %6 %7 %8 %9 --tidy-mark no -o %TIDYFILE% %INFILE% @%TIDY% -f %MSGFILE% -config %CFGFILE% %3 %4 %5 %6 %7 %8 %9 --tidy-mark no -o %TIDYFILE% %INFILE%
@set STATUS=%ERRORLEVEL% @set STATUS=%ERRORLEVEL%
@echo Testing %1, expect %EXPECTED%, got %STATUS% @echo Testing %1, expect %EXPECTED%, got %STATUS%, msg %MSGFILE%
@echo Testing %1, expect %EXPECTED%, got %STATUS% >> %TMPTEST% @echo Testing %1, expect %EXPECTED%, got %STATUS%, msg %MSGFILE% >> %TMPTEST%
@if %STATUS% EQU %EXPECTED% goto done @if %STATUS% EQU %EXPECTED% goto done
@set ERRTESTS=%ERRTESTS% %TESTNO% @set ERRTESTS=%ERRTESTS% %TESTNO%
@ -115,5 +116,10 @@ goto done
@echo. @echo.
@goto done @goto done
:Err10
@echo ERROR: TMPTEST not set in evironment!
@echo.
@goto done
:done :done