From 67d286d49965f039c47bf3a7f3b6c8206fab852a Mon Sep 17 00:00:00 2001
From: Ilya Sinitsyn <the_siv@mail.ru>
Date: Wed, 30 Dec 2020 13:49:26 +0700
Subject: [PATCH] Remove build with ASAN from Travis builds

---
 .travis.yml              |  4 ++--
 build/tools/travis-ci.sh | 17 +----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6a9f1a1fa..30c54fc91d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,8 @@ jobs:
           name: wxGTK ANSI Ubuntu 20.04
         - dist: focal
           compiler: gcc
-          env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-compat30 --disable-sys-libs" wxSKIP_SAMPLES=1 wxUSE_ASAN=1
-          name: wxGTK Ubuntu 20.04 with ASAN
+          env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-compat30 --disable-sys-libs" wxSKIP_SAMPLES=1
+          name: wxGTK Ubuntu 20.04
         - os: osx
           osx_image: xcode7.3
           compiler: clang
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index 7cd5152621..27b3c948fa 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -21,11 +21,6 @@ case $wxTOOLSET in
         fi
         cmake --version
 
-        if [ "$wxUSE_ASAN" = 1 ]; then
-            echo "ASAN currently isn't supported in CMake builds"
-            exit 1
-        fi
-
         echo 'travis_fold:start:configure'
         echo 'Configuring...'
         mkdir build_cmake
@@ -72,17 +67,7 @@ case $wxTOOLSET in
             wxCONFIGURE_OPTIONS="--with-gtk=$wxGTK_VERSION $wxCONFIGURE_OPTIONS"
         fi
 
-        if [ "$wxUSE_ASAN" = 1 ]; then
-            export LSAN_OPTIONS=suppressions=$(pwd)/misc/suppressions/lsan
-
-            wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
-            wxASAN_CXXFLAGS=$wxASAN_CFLAGS
-            wxASAN_LDFLAGS="-fsanitize=address"
-
-            ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
-        else
-            ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
-        fi
+        ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
 
         if [ -n "$rc" ]; then
             echo '*** Configuring failed, contents of config.log follows: ***'