From: Willy Tarreau Date: Wed, 18 Mar 2020 08:35:58 +0000 (+0100) Subject: CI: travis: re-enable ASAN on clang X-Git-Tag: v2.2-dev5~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ebeca1ed368ec169ef693873e10d43c61cb10b;p=thirdparty%2Fhaproxy.git CI: travis: re-enable ASAN on clang As spotted by Tim, ASAN is disabled on clang-9 due to an exact compiler name match. Let's relax the rule and accept "clang" and "clang-*". More context here: https://www.mail-archive.com/haproxy@formilux.org/msg36688.html --- diff --git a/.travis.yml b/.travis.yml index 5808386e32..ec71fc806f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,7 +105,7 @@ install: - travis_wait scripts/build-ssl.sh > build-ssl.log 2>&1 || (cat build-ssl.log && exit 1) script: - - if [ "$CC" = "clang" ]; then export FLAGS="$FLAGS USE_OBSOLETE_LINKER=1" DEBUG_CFLAGS="-g -fsanitize=address" LDFLAGS="-fsanitize=address"; fi + - if [ "${CC%-*}" = "clang" ]; then export FLAGS="$FLAGS USE_OBSOLETE_LINKER=1" DEBUG_CFLAGS="-g -fsanitize=address" LDFLAGS="-fsanitize=address"; fi - make -C contrib/wurfl - make -j3 CC=$CC V=1 ERR=1 TARGET=$TARGET $FLAGS DEBUG_CFLAGS="$DEBUG_CFLAGS" LDFLAGS="$LDFLAGS -L$SSL_LIB -Wl,-rpath,$SSL_LIB" 51DEGREES_SRC="$FIFTYONEDEGREES_SRC" EXTRA_OBJS="$EXTRA_OBJS" - ./haproxy -vv