Allow systests to be skipped in PR builds

RE #34850

Author: cailafinn

buildconfig/CMake/PyUnitTest.cmake

@@ -79,11 +79,19 @@ function(PYSYSTEMTEST_ADD_TEST)
   # Add all of the individual tests so that they can be run in parallel
   foreach(part ${ARGN})
     set(_test_name ${part})
+    if(NOT PR_JOB)
+      set(_system_test_options "-l information --quiet --output-on-failure")
+    else()
+      set(_system_test_options "-l information --quiet --output-on-failure --exclude-in-pull-requests")
+    endif()
+
     if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-      add_test(NAME ${_test_name} COMMAND ${CMAKE_BINARY_DIR}/systemtest_no_update.bat -R ${_test_name})
+      add_test(NAME ${_test_name} COMMAND ${CMAKE_BINARY_DIR}/systemtest_no_update.bat -R ${_test_name}
+                                          ${_system_test_options}
+      )
     else()
-      add_test(NAME ${_test_name} COMMAND ${CMAKE_BINARY_DIR}/systemtest_no_update -R ${_test_name} -l information
-                                          --quiet --output-on-failure
+      add_test(NAME ${_test_name} COMMAND ${CMAKE_BINARY_DIR}/systemtest_no_update -R ${_test_name}
+                                          ${_system_test_options}
       )
     endif()
 

buildconfig/Jenkins/Conda/build

@@ -38,6 +38,10 @@ if [[ $OSTYPE == "msys"* ]]; then
     BUILD_OPTIONS="$BUILD_OPTIONS --config Release"
 fi
 
+if [[ ${JOB_NAME} == *pull_requests* ]]; then
+    EXTRA_CMAKE_FLAGS+=" -DPR_JOB=True"
+fi
+
 # Run CMake using preset and variables
 cmake --preset=${CMAKE_PRESET} ${MANTID_DATA_STORE_CMAKE} ${EXTRA_CMAKE_FLAGS} $WORKSPACE
 

buildconfig/Jenkins/Conda/run-tests

@@ -108,9 +108,5 @@ if [[ $ENABLE_SYSTEM_TESTS == true ]]; then
 
     SYSTEM_TEST_OPTIONS="-j${BUILD_THREADS_SYSTEM_TESTS} --no-compress-output --schedule-random --repeat until-pass:3"
 
-    if [[ ${JOB_NAME} == *pull_requests* ]]; then
-        SYSTEM_TEST_OPTIONS+=" --exclude-in-pull-requests"
-    fi
-
     run_with_xvfb ctest -L SystemTest -T Test -O test_logs/systest_$OSTYPE.log $SYSTEM_TEST_OPTIONS $WINDOWS_TEST_OPTIONS
 fi