diff --git a/testsuite/python/CMakeLists.txt b/testsuite/python/CMakeLists.txt index 23763096f2..ee457e27fc 100644 --- a/testsuite/python/CMakeLists.txt +++ b/testsuite/python/CMakeLists.txt @@ -100,8 +100,6 @@ function(python_test) add_test(${TEST_NAME} ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${TEST_FILE_CONFIGURED} ${TEST_ARGUMENTS}) endif() - set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${TEST_NUM_PROC} - DEPENDS "${TEST_DEPENDS}") if(${TEST_GPU_SLOTS} GREATER 0 AND ESPRESSO_BUILD_WITH_CUDA) set_property(TEST ${TEST_NAME} PROPERTY RESOURCE_GROUPS @@ -117,7 +115,10 @@ function(python_test) if(${TEST_NUM_PROC} EQUAL 3) list(APPEND TEST_LABELS "parallel_odd") endif() - set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${TEST_LABELS}") + + set_tests_properties( + ${TEST_NAME} PROPERTIES PROCESSORS ${TEST_NUM_PROC} SKIP_RETURN_CODE 5 + DEPENDS "${TEST_DEPENDS}" LABELS "${TEST_LABELS}") set(python_tests ${python_tests} ${TEST_FILE_CONFIGURED} PARENT_SCOPE) endfunction(python_test) diff --git a/testsuite/scripts/CMakeLists.txt b/testsuite/scripts/CMakeLists.txt index df0077fff4..929d5ef890 100644 --- a/testsuite/scripts/CMakeLists.txt +++ b/testsuite/scripts/CMakeLists.txt @@ -39,9 +39,9 @@ macro(PYTHON_SCRIPTS_TEST) string(REGEX REPLACE "^test_" "${TEST_TYPE}_" TEST_NAME ${TEST_NAME}) add_test(${TEST_NAME} ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${TEST_FILE_CONFIGURED}) - set_tests_properties(${TEST_NAME} PROPERTIES FIXTURES_REQUIRED - IMPORTLIB_WRAPPER) - set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${TEST_LABELS}") + set_tests_properties( + ${TEST_NAME} PROPERTIES FIXTURES_REQUIRED IMPORTLIB_WRAPPER + SKIP_RETURN_CODE 5 LABELS "${TEST_LABELS}") if("gpu" IN_LIST TEST_LABELS AND ESPRESSO_BUILD_WITH_CUDA) set_tests_properties(${TEST_NAME} PROPERTIES RESOURCE_LOCK GPU) endif() diff --git a/testsuite/scripts/benchmarks/CMakeLists.txt b/testsuite/scripts/benchmarks/CMakeLists.txt index 14872e52bf..47583fdb57 100644 --- a/testsuite/scripts/benchmarks/CMakeLists.txt +++ b/testsuite/scripts/benchmarks/CMakeLists.txt @@ -25,8 +25,9 @@ endfunction(BENCHMARK_TEST) # configure Python module importlib_wrapper.py add_test(importlib_wrapper ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER}) -set_tests_properties(importlib_wrapper PROPERTIES FIXTURES_SETUP - IMPORTLIB_WRAPPER) +set_tests_properties( + importlib_wrapper PROPERTIES FIXTURES_SETUP IMPORTLIB_WRAPPER + SKIP_RETURN_CODE 5) set(benchmarks_tests ${benchmarks_tests} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER} PARENT_SCOPE) configure_file(../importlib_wrapper.py diff --git a/testsuite/scripts/samples/CMakeLists.txt b/testsuite/scripts/samples/CMakeLists.txt index 78d4a9c267..2fde3a87cb 100644 --- a/testsuite/scripts/samples/CMakeLists.txt +++ b/testsuite/scripts/samples/CMakeLists.txt @@ -25,8 +25,9 @@ endfunction(SAMPLE_TEST) # configure Python module importlib_wrapper.py add_test(importlib_wrapper ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER}) -set_tests_properties(importlib_wrapper PROPERTIES FIXTURES_SETUP - IMPORTLIB_WRAPPER) +set_tests_properties( + importlib_wrapper PROPERTIES FIXTURES_SETUP IMPORTLIB_WRAPPER + SKIP_RETURN_CODE 5) set(samples_tests ${samples_tests} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER} PARENT_SCOPE) configure_file(../importlib_wrapper.py diff --git a/testsuite/scripts/tutorials/CMakeLists.txt b/testsuite/scripts/tutorials/CMakeLists.txt index 32cc187d9c..2f02630a95 100644 --- a/testsuite/scripts/tutorials/CMakeLists.txt +++ b/testsuite/scripts/tutorials/CMakeLists.txt @@ -28,9 +28,9 @@ add_test(importlib_wrapper ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER}) add_test(convert ${CMAKE_BINARY_DIR}/pypresso ${PYPRESSO_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}/test_convert.py) -set_tests_properties(importlib_wrapper PROPERTIES FIXTURES_SETUP - IMPORTLIB_WRAPPER) -set_tests_properties(convert PROPERTIES FIXTURES_SETUP IMPORTLIB_WRAPPER) +set_tests_properties( + importlib_wrapper convert PROPERTIES FIXTURES_SETUP IMPORTLIB_WRAPPER + SKIP_RETURN_CODE 5) set(tutorials_tests ${tutorials_tests} ${TEST_FILE_CONFIGURED_IMPORTLIB_WRAPPER} PARENT_SCOPE) configure_file(../importlib_wrapper.py