Test running scripts tell ctest of skipped tests

CMake sets 125 as the skipped test exit code that the scripts use.
This commit is contained in:
Paulo Matos committed 2024-07-26 14:04:54 +02:00
1 parent 9201ac5a6b
commit b1ec50c7c2
9 files changed
+12 -9

No files matched your search

+2 -2
View File
@@ -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):
+2 -3
View File
@@ -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);
+1
View File
@@ -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")
+1
View File
@@ -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")
+2
View File
@@ -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()
+1 -1
View File
@@ -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(
+1 -1
View File
@@ -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(
+1 -1
View File
@@ -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(
+1 -1
View File
@@ -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")