Re #8882. Run all the tests except the MantidPlot ones.

mantidproject · Apr 3, 2014 · 368568e · 368568e
1 parent b80c5fd
commit 368568e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -54,9 +54,8 @@ make -j$BUILD_THREADS AllTests
 # Run the tests
 ###############################################################################
 # Remove any Mantid.user.properties file
-#rm ~/.mantid/Mantid.user.properties
-ctest -j$BUILD_THREADS --output-on-failure --timeout 30 -R KernelTest
-#ctest -j$BUILD_THREADS --output-on-failure --timeout 30 -E MantidPlot
+rm ~/.mantid/Mantid.user.properties
+ctest -j$BUILD_THREADS --output-on-failure --timeout 30 -E MantidPlot
 # Run GUI tests serially
 #ctest --output-on-failure --timeout 30 -R MantidPlot
 
diff --git a/Code/Mantid/Build/Jenkins/buildscript.bat b/Code/Mantid/Build/Jenkins/buildscript.bat
@@ -48,8 +48,7 @@ if ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Run the tests
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-"C:\Program Files (x86)\CMake 2.8\bin\ctest.exe" -C Release -j%BUILD_THREADS% --output-on-failure -R KernelTest_
-::ctest -C Release -j%BUILD_THREADS% --timeout 30 --output-on-failure -E MantidPlot
+"C:\Program Files (x86)\CMake 2.8\bin\ctest.exe" -C Release -j%BUILD_THREADS% --timeout 30 --output-on-failure -E MantidPlot
 :: Run GUI tests serially
 ::ctest -C Release --timeout 30 --output-on-failure -R MantidPlot