Commit 1146abed authored by Jan Möbius's avatar Jan Möbius

Merge branch 'featureSimplerCTestScript' into 'master'

don't run ctest in dashboard mode anymore for easier location of log

See merge request !32
parents 295dc867 6d092ea3
......@@ -11,20 +11,6 @@ REM Delete old test result collection generated by ctest
del /Q CTestResults.xml
REM Run the tests
ctest -D ExperimentalTest -C Release --no-compress-output
ctest -C Release --no-compress-output
IF %errorlevel% NEQ 0 exit /b %errorlevel%
REM Call head on the TAG to get the current folder where the test results are
FOR /F "tokens=1 delims= " %%i IN ('tests\head.bat 1 Testing\TAG') DO @set result=%%i
REM Go into that folder
cd Testing
cd %result%
REM copy generated xml results file to the location where jenkins expects it
copy /Y Test.xml ..\..\CTestResults.xml
REM Go back to start directory
REM cd ..
REM cd ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
\ No newline at end of file
......@@ -12,8 +12,7 @@ if [ $(uname) == Darwin ]; then
CTEST_BINARY=/opt/local/bin/ctest
fi
$CTEST_BINARY -D ExperimentalTest --no-compress-output
$CTEST_BINARY --no-compress-output
ERRORLEVEL=$?
cp Testing/`head -n 1 Testing/TAG`/Test.xml CTestResults.xml
exit $ERRORLEVEL
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment