summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author杨威 <[email protected]>2020-10-14 14:54:12 +0800
committeryangwei <[email protected]>2020-12-04 10:31:10 +0800
commit24e259defce1027bf976531761f7a5d5b7e964a4 (patch)
treea67b0f9b4e26978390cf926165b858cd10df7855
parent21afcda352906efbeb355835cecaf6c56f7a152a (diff)
Update travis.sh, ASAN using devtoolset-7
Update .gitlab-ci.yml testing源仅debug版开启asan
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--ci/travis.sh5
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a513fa9..6a72925 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ develop_build_release:
BUILD_TYPE: RelWithDebInfo
PACKAGE: 1
UPLOAD_RPM: 1
- ASAN_OPTION: ADDRESS
+ ASAN_OPTION: "OFF"
TESTING_VERSION_BUILD: 1
PULP3_REPO_NAME: protocol-testing-x86_64.el7
PULP3_DIST_NAME: protocol-testing-x86_64.el7
diff --git a/ci/travis.sh b/ci/travis.sh
index 56f0553..24fe71f 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