From b1ec50c7c237dba57a683edcd1ead2f07b3f65ba Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Fri, 26 Jul 2024 13:46:18 +0200 Subject: [PATCH] Test running scripts tell ctest of skipped tests CMake sets 125 as the skipped test exit code that the scripts use. --- Scripts/guest_test_runner.py | 4 ++-- Scripts/testharness_runner.py | 5 ++--- unittests/32Bit_ASM/CMakeLists.txt | 1 + unittests/ASM/CMakeLists.txt | 1 + unittests/FEXLinuxTests/CMakeLists.txt | 2 ++ unittests/POSIX/CMakeLists.txt | 2 +- unittests/gcc-target-tests-32/CMakeLists.txt | 2 +- unittests/gcc-target-tests-64/CMakeLists.txt | 2 +- unittests/gvisor-tests/CMakeLists.txt | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Scripts/guest_test_runner.py b/Scripts/guest_test_runner.py index 78ebaa325..e13f44eda 100644 --- a/Scripts/guest_test_runner.py +++ b/Scripts/guest_test_runner.py @@ -130,8 +130,8 @@ if (flake_tests.get(test_name)): TryCount = 5 if (disabled_tests.get(test_name)): - print(f"Test {test_name} is disabled") - sys.exit(0) + # This error code tells ctest that the test was skipped + sys.exit(125) # expect zero by default if (not test_name in expected_output): diff --git a/Scripts/testharness_runner.py b/Scripts/testharness_runner.py index b7b976cbe..f9fa35cd3 100644 --- a/Scripts/testharness_runner.py +++ b/Scripts/testharness_runner.py @@ -55,8 +55,8 @@ for i in range(len(sys.argv) - args_start_index): RunnerArgs.append(sys.argv[args_start_index + i]) if (disabled_tests.get(current_test)): - print("Skipping", current_test) - sys.exit(0) + # This error code tells ctest that the test was skipped + sys.exit(125) # Run the test and wait for it to end to get the result Process = subprocess.Popen(RunnerArgs) @@ -74,4 +74,3 @@ if (known_failures.get(current_test)): else: # Just return the result code if we don't have this test as a known failure sys.exit(ResultCode); - diff --git a/unittests/32Bit_ASM/CMakeLists.txt b/unittests/32Bit_ASM/CMakeLists.txt index 26366f146..2c5bb6c39 100644 --- a/unittests/32Bit_ASM/CMakeLists.txt +++ b/unittests/32Bit_ASM/CMakeLists.txt @@ -99,6 +99,7 @@ foreach(ASM_SRC ${ASM_SOURCES}) set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${CMAKE_BINARY_DIR}/Bin/TestHarnessRunner") set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${OUTPUT_NAME}") set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${OUTPUT_CONFIG_NAME}") + set_property(TEST ${TEST_NAME} APPEND PROPERTY SKIP_RETURN_CODE 125) if (MINGW_BUILD) # Ensure the DOS region can be allocated. set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT "WINEPRELOADRESERVE=10000-110000") diff --git a/unittests/ASM/CMakeLists.txt b/unittests/ASM/CMakeLists.txt index b78073e1c..c69f54de8 100644 --- a/unittests/ASM/CMakeLists.txt +++ b/unittests/ASM/CMakeLists.txt @@ -106,6 +106,7 @@ foreach(ASM_SRC ${ASM_SOURCES}) set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${CMAKE_BINARY_DIR}/Bin/TestHarnessRunner") set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${OUTPUT_NAME}") set_property(TEST ${TEST_NAME} APPEND PROPERTY DEPENDS "${OUTPUT_CONFIG_NAME}") + set_property(TEST ${TEST_NAME} APPEND PROPERTY SKIP_RETURN_CODE 125) if (MINGW_BUILD) # Ensure the DOS region can be allocated. set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT "WINEPRELOADRESERVE=10000-110000") diff --git a/unittests/FEXLinuxTests/CMakeLists.txt b/unittests/FEXLinuxTests/CMakeLists.txt index ecc041df2..5279773bd 100644 --- a/unittests/FEXLinuxTests/CMakeLists.txt +++ b/unittests/FEXLinuxTests/CMakeLists.txt @@ -79,7 +79,9 @@ function(AddTests Tests BinDirectory Bitness) "${TEST_CASE}" "host" "${BIN_PATH}") + set_property(TEST "${TEST_CASE}.host.flt" APPEND PROPERTY SKIP_RETURN_CODE 125) endif() + set_property(TEST "${TEST_CASE}.jit.flt" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() endfunction() diff --git a/unittests/POSIX/CMakeLists.txt b/unittests/POSIX/CMakeLists.txt index eac0bc6da..eeb84b811 100644 --- a/unittests/POSIX/CMakeLists.txt +++ b/unittests/POSIX/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(POSIX_TEST ${POSIX_TESTS}) "${CMAKE_BINARY_DIR}/Bin/FEXLoader" "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" "${POSIX_TEST}") - + set_property(TEST "${TEST_NAME}.jit.posix" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() add_custom_target( diff --git a/unittests/gcc-target-tests-32/CMakeLists.txt b/unittests/gcc-target-tests-32/CMakeLists.txt index f520c7003..d5bd27c6e 100644 --- a/unittests/gcc-target-tests-32/CMakeLists.txt +++ b/unittests/gcc-target-tests-32/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(TEST ${TESTS}) "${CMAKE_BINARY_DIR}/Bin/FEXLoader" "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" "${TEST}") - + set_property(TEST "${TEST_NAME}.jit.gcc-target-32" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() add_custom_target( diff --git a/unittests/gcc-target-tests-64/CMakeLists.txt b/unittests/gcc-target-tests-64/CMakeLists.txt index bb49082fa..eb92e0f49 100644 --- a/unittests/gcc-target-tests-64/CMakeLists.txt +++ b/unittests/gcc-target-tests-64/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(TEST ${TESTS}) "${CMAKE_BINARY_DIR}/Bin/FEXLoader" "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" "${TEST}") - + set_property(TEST "${TEST_NAME}.jit.gcc-target-64" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() add_custom_target( diff --git a/unittests/gvisor-tests/CMakeLists.txt b/unittests/gvisor-tests/CMakeLists.txt index af72a1cf1..0e304e107 100644 --- a/unittests/gvisor-tests/CMakeLists.txt +++ b/unittests/gvisor-tests/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(TEST ${TESTS}) "${CMAKE_BINARY_DIR}/Bin/FEXLoader" "-o" "stderr" "--no-silent" "-c" "irjit" "-n" "500" "--" "${TEST}") - + set_property(TEST "${TEST_NAME}.jit.gvisor" APPEND PROPERTY SKIP_RETURN_CODE 125) endforeach() set(RM_DIR_COMMAND "rm $ENV{ROOTFS}/tmp 2> /dev/null || true")