From f5daea7f10e06bb1b5fc8266fc757df972748021 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Fri, 28 Dec 2018 23:13:01 -0800
Subject: [PATCH] tests: strip-trailing-cr: avoid failure with ASAN

* tests/strip-trailing-cr (valgrind): Define as no-op when diff
has compiled with sanitizer support.
---
 tests/strip-trailing-cr | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

-- 
2.20.1.2.gb21ebb671b