Skip to content

Commit

Permalink
Small improvements to the CI infrastructure
Browse files Browse the repository at this point in the history
- avoid inlining for the debug testing so that suppressions work
- provide more output for triggered errors

No functional change.
  • Loading branch information
vondele authored and snicolet committed Jan 9, 2019
1 parent 70880b8 commit d2acdac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ script:
#
# Valgrind
#
- export CXXFLAGS=-O1
- export CXXFLAGS="-O1 -fno-inline"
- 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
#
Expand Down
4 changes: 2 additions & 2 deletions tests/instrumented.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ case $1 in
echo "sanitizer-undefined testing started"
prefix='!'
exeprefix=''
postfix='2>&1 | grep "runtime error:"'
postfix='2>&1 | grep -A50 "runtime error:"'
threads="1"
;;
--sanitizer-thread)
echo "sanitizer-thread testing started"
prefix='!'
exeprefix=''
postfix='2>&1 | grep "WARNING: ThreadSanitizer:"'
postfix='2>&1 | grep -A50 "WARNING: ThreadSanitizer:"'
threads="2"

cat << EOF > tsan.supp
Expand Down

0 comments on commit d2acdac

Please sign in to comment.