From 1950d5d365ab121d0aa6fa3cc8ba23faff1de91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Fri, 17 Jan 2014 00:02:45 +0100 Subject: [PATCH] fixed test script --- build/script/runtests.cmd | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build/script/runtests.cmd b/build/script/runtests.cmd index be38e8200..7100a1cb3 100644 --- a/build/script/runtests.cmd +++ b/build/script/runtests.cmd @@ -4,7 +4,7 @@ rem $Id$ rem rem A script for running the POCO testsuites. rem -rem usage: runtests +rem usage: runtests [64] rem rem If the environment variable EXCLUDE_TESTS is set, containing rem a space-separated list of project names (as found in the @@ -15,6 +15,11 @@ setlocal EnableDelayedExpansion set TESTRUNNER=TestSuite.exe set TESTRUNNERARGS=/B:TestSuite.out +set BINDIR=bin + +if "%1"=="64" ) + set BINDIR=bin64 +) set runs=0 set failures=0 @@ -32,7 +37,7 @@ for /f %%C in ('findstr /R "." components') do ( if !excluded!==0 ( if exist %%C ( if exist %%C\testsuite ( - if exist %%C\testsuite\bin\%TESTRUNNER% ( + if exist %%C\testsuite\%BINDIR%\%TESTRUNNER% ( echo. echo. echo **************************************** @@ -42,14 +47,14 @@ for /f %%C in ('findstr /R "." components') do ( set /a runs=!runs! + 1 set dir=%CD% - cd %%C\testsuite\bin + cd %%C\testsuite\%BINDIR% %TESTRUNNER% %TESTRUNNERARGS% if !ERRORLEVEL! neq 0 ( set /a failures=!failures! + 1 set failedTests=!failedTests! %%C set status=1 ) - if exists TestSuite.out ( + if exist TestSuite.out ( type TestSuite.out ) cd !dir!