From a6fb4c9b77ece6aba463f58e3129caa0e8ea29f9 Mon Sep 17 00:00:00 2001
From: 杨威 <yangwei@iie.ac.cn>
Date: Wed, 14 Oct 2020 15:58:37 +0800
Subject: Update travis.sh, ASAN using devtoolset-7

---
 ci/travis.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ci/travis.sh b/ci/travis.sh
index 60f79a2..d32c1c6 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -37,6 +37,11 @@ if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
 	yum install -y $INSTALL_DEPENDENCY_LIBRARY
 	source /etc/profile.d/framework.sh
 fi
+
+if [ $ASAN_OPTION ];then
+	source /opt/rh/devtoolset-7/enable
+fi
+
 mkdir build || true
 cd build
 
-- 
cgit v1.2.3


From f0cc671da2671e30e4fc80e9182671b6f4c94aac Mon Sep 17 00:00:00 2001
From: 杨威 <yangwei@iie.ac.cn>
Date: Fri, 30 Oct 2020 22:54:40 +0800
Subject: Update .gitlab-ci.yml testing源仅debug版开启asan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbe113d..eecede0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,6 @@ develop_build_release:
     BUILD_TYPE: RelWithDebInfo
     PACKAGE: 1
     UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
     TESTING_VERSION_BUILD: 1
     PULP3_REPO_NAME: tsg-testing-x86_64.el7
     PULP3_DIST_NAME: tsg-testing-x86_64.el7
-- 
cgit v1.2.3