From 0b5a8fc127ab282648828304fe06a2652dc3553a Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Thu, 28 May 2020 11:54:11 +0200
Subject: ci: get rid of all extra asan handling

Now that we have this in meson setup we do not need all the CI script
logic here anymore.

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11903
---
 .ci/ci-make-check.sh   | 6 +-----
 .ci/ci-make-install.sh | 4 ----
 .ci/ci-make.sh         | 5 -----
 3 files changed, 1 insertion(+), 14 deletions(-)

(limited to '.ci')

diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 0aab8eb681..c47eb24627 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -24,11 +24,7 @@ fi
 travis_fold check "ninja test"
 if [ "$DISTRO" != "" ] ; then
   for tries in $(seq 1 ${NUM_TRIES}); do
-    if [ "$1" = "asan" ]; then
-      (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=detect_leaks=0:abort_on_error=0:detect_odr_violation=0 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch) && break
-    else
-      (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
-    fi
+    (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
     docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
     if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
       false
diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh
index 0a4cea890a..a3c5320149 100755
--- a/.ci/ci-make-install.sh
+++ b/.ci/ci-make-install.sh
@@ -8,10 +8,6 @@ if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
 fi
 
 travis_fold install "ninja install"
-if [ "$1" = "asan" ]; then
-  docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install
-  exit $?
-fi
 if [ "$DISTRO" != "" ] ; then
   docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 9d0574a5cf..fcb99f781b 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -8,11 +8,6 @@ if [ "$1" = "release-ready" ] ; then
 fi
 
 travis_fold ninja ninja
-if [ "$1" = "asan" ]; then
-  docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build
-  exit $?
-fi
-
 if [ "$DISTRO" != "" ] ; then
   if [ "$1" = "coverity" ] ; then
     docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build"
-- 
cgit v1.2.1