From b6b35f0e0b96d43c00256ff10ceefc2c53021158 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 16 Nov 2018 15:49:02 +0100
Subject: [PATCH] travis: make the ASan & UBsan job a little bit stricter

---
 travis-ci/managers/fedora.sh        | 6 +++++-
 travis-ci/managers/travis_wait.bash | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index 077595c482..09122f7232 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -57,7 +57,11 @@ for phase in "${PHASES[@]}"; do
             $DOCKER_EXEC ninja -v -C build
 
             # Never remove halt_on_error from UBSAN_OPTIONS. See https://github.com/systemd/systemd/commit/2614d83aa06592aedb.
-            travis_wait docker exec --interactive=false -t $CONT_NAME sh -c "UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 meson test --timeout-multiplier=3 -C ./build/ --print-errorlogs"
+            travis_wait docker exec --interactive=false \
+                -e UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 \
+                -e ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1 \
+                -t $CONT_NAME \
+                meson test --timeout-multiplier=3 -C ./build/ --print-errorlogs
             ;;
         CLEANUP)
             info "Cleanup phase"
diff --git a/travis-ci/managers/travis_wait.bash b/travis-ci/managers/travis_wait.bash
index 3de9b9b0cd..acf6ad15e4 100644
--- a/travis-ci/managers/travis_wait.bash
+++ b/travis-ci/managers/travis_wait.bash
@@ -41,9 +41,11 @@ travis_wait() {
   local result
 
   {
+    set +e
     wait "${cmd_pid}" 2>/dev/null
     result="${?}"
     ps -p"${jigger_pid}" &>/dev/null && kill "${jigger_pid}"
+    set -e
   }
 
   if [[ "${result}" -eq 0 ]]; then