Skip to content

Commit aa70064

Browse files
committed
Extended timeout for rust in thread sanitizer.
1 parent b30ea5c commit aa70064

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

source/ports/py_port/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ if(OPTION_BUILD_CLI)
6060
PROPERTY LABELS ${py_port_test}
6161
)
6262

63+
# Extend timeout when using thread sanitizer and rust
64+
if(OPTION_BUILD_THREAD_SANITIZER AND OPTION_BUILD_LOADERS_RS)
65+
set_tests_properties(${target} PROPERTIES TIMEOUT 7200)
66+
endif()
67+
6368
include(TestEnvironmentVariables)
6469

6570
test_environment_variables(${target}
@@ -99,6 +104,11 @@ set_property(TEST ${py_port_test_exec}
99104
PROPERTY LABELS ${py_port_test_exec}
100105
)
101106

107+
# Extend timeout when using thread sanitizer and rust
108+
if(OPTION_BUILD_THREAD_SANITIZER AND OPTION_BUILD_LOADERS_RS)
109+
set_tests_properties(${py_port_test_exec} PROPERTIES TIMEOUT 7200)
110+
endif()
111+
102112
include(TestEnvironmentVariables)
103113

104114
test_environment_variables(${py_port_test_exec}

source/tests/metacall_python_port_test/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,15 @@ add_test(NAME ${target}
135135
COMMAND $<TARGET_FILE:${target}>
136136
)
137137

138-
# Enable rust test if it is built (address sanitizer does not work with Rust on Linux)
139-
if(OPTION_BUILD_LOADERS_RS AND NOT (OPTION_BUILD_ADDRESS_SANITIZER AND PROJECT_OS_LINUX))
138+
# Enable rust test if it is built
139+
if(OPTION_BUILD_LOADERS_RS)
140140
set(RS_DEPENDENCY rs_loader)
141141
set(TESTS_ENVIRONMENT_VARIABLES_RS "OPTION_BUILD_LOADERS_RS=1")
142+
143+
# Extend timeout when using thread sanitizer and rust
144+
if(OPTION_BUILD_THREAD_SANITIZER)
145+
set_tests_properties(${target} PROPERTIES TIMEOUT 7200)
146+
endif()
142147
endif()
143148

144149
#

source/tests/metacall_rust_test/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ set_property(TEST ${target}
148148
PROPERTY LABELS ${target}
149149
)
150150

151+
# Extend timeout when using thread sanitizer
152+
if(OPTION_BUILD_THREAD_SANITIZER)
153+
set_tests_properties(${target} PROPERTIES TIMEOUT 7200)
154+
endif()
155+
151156
include(TestEnvironmentVariables)
152157

153158
test_environment_variables(${target}

0 commit comments

Comments
 (0)