Merge pull request #87 from mantidproject/feature/10694_use_run_serial

Without the big changes to the windows build script this is finally good.

Code/Mantid/Build/Jenkins/buildscript

@@ -98,17 +98,15 @@ $SCL_ON_RHEL6 "cmake -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DMAKE
 ###############################################################################
 # Build step
 ###############################################################################
-$SCL_ON_RHEL6 "make -j$BUILD_THREADS"
-$SCL_ON_RHEL6 "make -j$BUILD_THREADS AllTests"
+$SCL_ON_RHEL6 "cmake --build . -- -j$BUILD_THREADS"
+$SCL_ON_RHEL6 "cmake --build . --target AllTests -- -j$BUILD_THREADS"
 
 ###############################################################################
 # Run the tests
 ###############################################################################
 # Remove any Mantid.user.properties file
 rm -f ~/.mantid/Mantid.user.properties
-$SCL_ON_RHEL6 "ctest -j$BUILD_THREADS --schedule-random --output-on-failure -E MantidPlot"
-# Run GUI tests serially
-$SCL_ON_RHEL6 "ctest --output-on-failure -R MantidPlot"
+$SCL_ON_RHEL6 "ctest -j$BUILD_THREADS --schedule-random --output-on-failure"
 
 ###############################################################################
 # Documentation
@@ -120,7 +118,7 @@ if [[ "$CLEANBUILD" == true ]]; then
   if [[ $(uname) == 'Darwin' ]]; then
     export MANTIDPATH=$PWD/bin
   fi
-  $SCL_ON_RHEL6 "make docs-qthelp"
+  $SCL_ON_RHEL6 "cmake --build . --target docs-qthelp"
 fi
 
 ###############################################################################
@@ -143,7 +141,7 @@ if [[ "$CLEANBUILD" == true ]]; then
   # and labelled by the commit id it was built with. This assumes the Jenkins git plugin
   # has set the GIT_COMMIT environment variable
   if [[ "$ON_RHEL6" == true ]]; then
-    $SCL_ON_RHEL6 "make docs-html"
+    $SCL_ON_RHEL6 "cmake --build . --target docs-html"
     tar -cjf mantiddocs-g${GIT_COMMIT:0:7}.tar.bz2 --exclude='*.buildinfo' --exclude="MantidProject.q*" docs/html
     # The ..._PREFIX argument avoids opt/Mantid directories at the top of the tree
     $SCL_ON_RHEL6 "cpack --config CPackSourceConfig.cmake -D CPACK_PACKAGING_INSTALL_PREFIX="

Code/Mantid/Build/Jenkins/buildscript.bat

@@ -59,17 +59,13 @@ if ERRORLEVEL 1 exit /B %ERRORLEVEL%
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Build step
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
 msbuild /nologo /m:%BUILD_THREADS% /nr:false /p:Configuration=%BUILD_CONFIG% Mantid.sln
 if ERRORLEVEL 1 exit /B %ERRORLEVEL%
 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: Run the tests
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-"C:\Program Files (x86)\CMake 2.8\bin\ctest.exe" -C %BUILD_CONFIG% -j%BUILD_THREADS% --schedule-random --output-on-failure -E MantidPlot
-if ERRORLEVEL 1 exit /B %ERRORLEVEL%
-:: Run GUI tests serially
-ctest -C %BUILD_CONFIG% --output-on-failure -R MantidPlot
+"C:\Program Files (x86)\CMake 2.8\bin\ctest.exe" -C %BUILD_CONFIG% -j%BUILD_THREADS% --schedule-random --output-on-failure
 if ERRORLEVEL 1 exit /B %ERRORLEVEL%
 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

Code/Mantid/MantidPlot/CMakeLists.txt

@@ -1003,7 +1003,7 @@ else ()
 	 	# Add the test. Name of test = name of the file
 		ADD_TEST( ${PYFILE} ${MANTIDPLOT_PATH} -xq ${CMAKE_CURRENT_SOURCE_DIR}/test/${PYFILE} )
 		# Set the previously-built environment
-		set_tests_properties( ${PYFILE} PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}")
+		set_tests_properties( ${PYFILE} PROPERTIES RUN_SERIAL 1 ENVIRONMENT "${TEST_ENVIRONMENT}")
 	endforeach ()
 
     add_dependencies( GUITests MantidPlot )