1 files changed, 81 insertions, 69 deletions
diff --git a/tests/runtest.bat b/tests/runtest.bat
index dc36666..1129b9b 100644
--- a/tests/runtest.bat
+++ b/tests/runtest.bat
@@ -1,69 +1,81 @@
-@echo off
-
-REM Usage: runtest cl|gcc testname prerequisit testarg ...
-
-if %3==_ goto noprereq
-if NOT EXIST %3.pass goto needprereq
-
-:noprereq
-if EXIST %2.fail goto forcetest
-if EXIST %2.pass goto bypass
-
-:forcetest
-if EXIST %2.fail erase %2.fail
-
-REM Make sure we start with only those files we expect to need
-if exist tmp\*.* echo y | erase tmp\*.* > nul:
-rmdir tmp
-mkdir tmp
-
-copy ..\pthread.dll tmp > nul:
-copy ..\pthread.h tmp > nul:
-copy ..\semaphore.h tmp > nul:
-copy ..\sched.h tmp > nul:
-copy test.h tmp > nul:
-copy ..\pthread.lib tmp > nul:
-copy ..\libpthread32.a tmp > nul:
-
-cd tmp
-
-REM Compile the test case
-REM  produces aout.exe using the compiler given as %1
-call ..\c%1.bat %2 > ..\%2.%1log
-
-if ERRORLEVEL 1 goto cleanup
-
-REM erase ..\%2.%1log
-
-echo TEST: %2 [%1]
-
-REM Run the test case
-if EXIST %2.pass erase %2.pass
-if EXIST %2.fail erase %2.fail
-if EXIST %2.notrun erase %2.notrun
-aout.exe %4 %5 %6 %7 %8 %9
-
-set RESULT=%ERRORLEVEL%
-
-if %RESULT% NEQ 0 echo Failed [%RESULT%] > ..\%2.fail
-if %RESULT% EQU 0 echo Passed > ..\%2.pass
-
-:cleanup
-
-cd ..
-
-REM Clean up
-if exist tmp\*.* echo y | erase tmp\*.* > nul:
-
-if EXIST %2.fail echo Failed [%RESULT%]
-if EXIST %2.pass echo Passed [%RESULT%]
-
-:bypass
-goto end
-
-:needprereq
-echo Test %2 requires %3 to pass before it can run.
-echo No Prereq > ..\%2.notrun
-goto end
-
-:end
+@echo off
+
+REM Usage: runtest cl  testname prerequisit testarg ...
+REM    or: runtest gcc testname prerequisit testarg ...
+
+if %3==_ goto noprereq
+if NOT EXIST %3.pass goto needprereq
+
+:noprereq
+if EXIST %2.fail goto forcetest
+if EXIST %2.pass goto bypass
+
+:forcetest
+if EXIST %2.fail erase %2.fail
+
+REM Make sure we start with only those files we expect to need
+if not exist tmp\*.* goto skip1
+echo y | erase tmp\*.* > nul:
+rmdir tmp
+mkdir tmp
+:skip1
+
+copy ..\pthread.dll tmp > nul:
+copy ..\pthread.h tmp > nul:
+copy ..\semaphore.h tmp > nul:
+copy ..\sched.h tmp > nul:
+copy test.h tmp > nul:
+copy ..\pthread.lib tmp > nul:
+REM copy ..\libpthread32.a tmp > nul:
+
+cd tmp
+
+REM Compile the test case
+REM  produces aout.exe using the compiler given as %1
+call ..\c%1.bat %2 > ..\%2.%1log
+
+if ERRORLEVEL 1 goto cleanup
+
+REM erase ..\%2.%1log
+
+echo TEST: %2 [%1]
+
+REM Run the test case
+if EXIST %2.pass erase %2.pass
+if EXIST %2.fail erase %2.fail
+if EXIST %2.notrun erase %2.notrun
+aout.exe %4 %5 %6 %7 %8 %9
+
+set RESULT=1
+if ERRORLEVEL 0 set RESULT=0
+
+REM set RESULT=%ERRORLEVEL%
+
+if %RESULT%==0 goto passed
+echo Failed [%RESULT%] > ..\%2.fail
+goto cleanup
+
+:passed
+echo Passed > ..\%2.pass
+
+:cleanup
+
+cd ..
+
+REM Clean up
+if not exist tmp\*.* goto skip2
+echo y | erase tmp\*.* > nul:
+:skip2
+
+if EXIST %2.fail echo Failed [%RESULT%]
+if EXIST %2.pass echo Passed [%RESULT%]
+
+:bypass
+goto end
+
+:needprereq
+echo Test %2 requires %3 to pass before it can run.
+echo No Prereq > ..\%2.notrun
+goto end
+
+:end