File tree Expand file tree Collapse file tree 3 files changed +16
-0
lines changed Expand file tree Collapse file tree 3 files changed +16
-0
lines changed Original file line number Diff line number Diff line change @@ -613,6 +613,11 @@ if (asan)
613613 set (RR_FLAGS "${ASAN_FLAGS} ${RR_FLAGS} " )
614614endif ()
615615
616+ file (REMOVE "${CMAKE_BINARY_DIR} /src/test/util_env.sh" )
617+ if (asan)
618+ file (WRITE "${CMAKE_BINARY_DIR} /src/test/util_env.sh" "export RR_ASAN=true\n " )
619+ endif ()
620+
616621set_source_files_properties (${RR_SOURCES}
617622 PROPERTIES COMPILE_FLAGS ${RR_FLAGS} )
618623
@@ -1779,6 +1784,9 @@ if(BUILD_TESTS)
17791784 set (TEST_MONITOR_DEFAULT_TIMEOUT 480)
17801785 else ()
17811786 set (TEST_MONITOR_DEFAULT_TIMEOUT 120)
1787+ if (asan)
1788+ set (TEST_MONITOR_DEFAULT_TIMEOUT 180)
1789+ endif ()
17821790 endif ()
17831791
17841792 # The real timeouts are handled by test-monitor
Original file line number Diff line number Diff line change 11source `dirname $0`/util.sh
22if [ $TIMEOUT -lt 600 ]; then TIMEOUT=600; fi
3+ if [ "$RR_ASAN" == "true" ]; then TIMEOUT=800; fi
34record record_replay_subject$bitness
45just_record rr "--suppress-environment-warnings replay -a $workdir/*-0"
56replay
Original file line number Diff line number Diff line change @@ -107,6 +107,10 @@ if [[ "$NO_CHECK_CACHED_MMAP" == "" ]]; then
107107 GLOBAL_OPTIONS=" ${GLOBAL_OPTIONS} --check-cached-mmaps"
108108fi
109109
110+ if [[ -f " ${OBJDIR} /src/test/util_env.sh" ]]; then
111+ source " ${OBJDIR} /src/test/util_env.sh"
112+ fi
113+
110114SRCDIR=` dirname ${BASH_SOURCE[0]} ` /../..
111115SRCDIR=` realpath $SRCDIR `
112116
@@ -135,6 +139,9 @@ OBJDIR=`realpath $OBJDIR`
135139TIMEOUT=$4
136140if [[ " $TIMEOUT " == " " ]]; then
137141 TIMEOUT=120
142+ if [ " $RR_ASAN " == " true" ]; then
143+ TIMEOUT=180
144+ fi
138145fi
139146
140147# The temporary directory we create for this test run.
You can’t perform that action at this time.
0 commit comments