Skip to content

Commit 78b747e

Browse files
committed
MB-57824: gtest: Set env vars for all Sanitizers, not just TSan
(Backport to fix Asan issues on neo branch under MB-59356) When passing env vars to gtest_discover_tests() to be added to the test suites it discovers, pass env vars for Asan & UBsan, not just TSan. Note this depends on the linked tlm change which introduces GTEST_ALL_SANITIZERS_ENV. Change-Id: I1db6482974584242fb3923d0bc1ca701e982f881 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/200494 Well-Formed: Restriction Checker Reviewed-by: Paolo Cocchi <[email protected]> Tested-by: Dave Rigby <[email protected]>
1 parent 9e12645 commit 78b747e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

engines/ep/tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ gtest_discover_tests(ep-engine_ep_unit_tests
212212
ONE_CTEST_PER_SUITE
213213
DISCOVERY_TIMEOUT 60
214214
PROPERTIES TIMEOUT 300
215-
ENVIRONMENT ${THREAD_SANITIZER_TEST_ENV})
215+
ENVIRONMENT ${GTEST_ALL_SANITIZERS_ENV})
216216
IF (COUCHBASE_MAGMA_COMMIT_VALIDATION)
217217
# Create a set of tests for magma which are filtered such that only the
218218
# magma variants should run
@@ -225,7 +225,7 @@ IF (COUCHBASE_MAGMA_COMMIT_VALIDATION)
225225
POST_SUITE_FILTER *agma
226226
DISCOVERY_TIMEOUT 60
227227
PROPERTIES TIMEOUT 300
228-
ENVIRONMENT ${THREAD_SANITIZER_TEST_ENV})
228+
ENVIRONMENT ${GTEST_ALL_SANITIZERS_ENV})
229229
ENDIF()
230230

231231
ADD_TEST(NAME ep-engine_misc_test COMMAND ep-engine_misc_test)

tests/testapp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ gtest_discover_tests(memcached_testapp
141141
ONE_CTEST_PER_SUITE
142142
DISCOVERY_TIMEOUT 60
143143
PROPERTIES TIMEOUT 300
144-
ENVIRONMENT ${THREAD_SANITIZER_TEST_ENV})
144+
ENVIRONMENT ${GTEST_ALL_SANITIZERS_ENV})
145145

146146
gtest_discover_tests(memcached_testapp
147147
EXTRA_ARGS -E ep ${VERBOSE_EXTRA_ARG}
@@ -150,4 +150,4 @@ gtest_discover_tests(memcached_testapp
150150
ONE_CTEST_PER_SUITE
151151
DISCOVERY_TIMEOUT 60
152152
PROPERTIES TIMEOUT 300
153-
ENVIRONMENT ${THREAD_SANITIZER_TEST_ENV})
153+
ENVIRONMENT ${GTEST_ALL_SANITIZERS_ENV})

0 commit comments

Comments
 (0)