diff options
author | Jim Meyering <meyering@fb.com> | 2018-12-28 23:13:01 -0800 |
---|---|---|
committer | Jim Meyering <meyering@fb.com> | 2018-12-29 08:14:03 -0800 |
commit | b33a91993401095d3785ede93caa71226eacc5e5 (patch) | |
tree | c23a0755ab266438e393f9c2faec1314d6fcbc6c /tests | |
parent | c7a4eacac909ec98e3a1ca45643b4a20766864ec (diff) | |
download | diffutils-b33a91993401095d3785ede93caa71226eacc5e5.tar.gz |
tests: strip-trailing-cr: avoid failure with ASAN
Valgrind cannot operate on an ASAN-compiled binary.
* tests/strip-trailing-cr (valgrind): Define as no-op when diff
was compiled with sanitizer support.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/strip-trailing-cr | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/strip-trailing-cr b/tests/strip-trailing-cr index 3188294..2810595 100755 --- a/tests/strip-trailing-cr +++ b/tests/strip-trailing-cr @@ -10,8 +10,13 @@ require_valgrind_ printf '\r' > r || framework_failure_ echo b > b || framework_failure_ +# Use valgrind only when no Sanitizer is in use: +ASAN_OPTIONS=help=true diff --help 2>&1 |grep Sanitizer > /dev/null \ + && eval 'valgrind() { "$@"; }' \ + || eval 'valgrind() { env valgrind --quiet --error-exitcode=3 "$@"; }' + for opt in '' u c Dfoo; do - returns_ 1 valgrind --quiet --error-exitcode=3 \ + returns_ 1 valgrind \ diff -a$opt --strip-trailing-cr r b > out 2> err || fail=1 done |