From 9d95d43c5793d46685127d8595b6fca350c9c9bd Mon Sep 17 00:00:00 2001 From: Joost VandeVondele Date: Thu, 31 Aug 2017 22:11:09 +0200 Subject: [PATCH] Multi-threaded search testing with valgrind Also check with valgrind the multi-threaded search. On top of the fix for issue #1227 (PR #1235). No functional change. --- .travis.yml | 1 + tests/instrumented.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c42badd4..02e35bc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,6 +63,7 @@ script: # - export CXXFLAGS=-O1 - if [ -x "$(command -v valgrind )" ]; then make clean && make -j2 ARCH=x86-64 debug=yes optimize=no build > /dev/null && ../tests/instrumented.sh --valgrind; fi + - if [ -x "$(command -v valgrind )" ]; then ../tests/instrumented.sh --valgrind-thread; fi # # Sanitizer # diff --git a/tests/instrumented.sh b/tests/instrumented.sh index 878d6cb0..2cae793c 100755 --- a/tests/instrumented.sh +++ b/tests/instrumented.sh @@ -17,15 +17,22 @@ case $1 in postfix='1>/dev/null' threads="1" ;; + --valgrind-thread) + echo "valgrind-thread testing started" + prefix='' + exeprefix='valgrind --error-exitcode=42' + postfix='1>/dev/null' + threads="2" + ;; --sanitizer-undefined) - echo "sanitizer testing started" + echo "sanitizer-undefined testing started" prefix='!' exeprefix='' postfix='2>&1 | grep "runtime error:"' threads="1" ;; --sanitizer-thread) - echo "sanitizer testing started" + echo "sanitizer-thread testing started" prefix='!' exeprefix='' postfix='2>&1 | grep "WARNING: ThreadSanitizer:"' -- 2.39.2