summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author刘学利 <[email protected]>2020-10-10 16:43:29 +0800
committer刘学利 <[email protected]>2020-10-10 16:43:29 +0800
commit57a052848cbb354d951cab6ef13eab64e8362289 (patch)
tree1388e75e4107719539379690ecd18e0a72c57309
parent4c43328a2d71d00380572c6f2c7f12c20d9c19a6 (diff)
Link tcmalloc and asanv4.1.9-testingv4.1.9
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--ci/travis.sh5
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d62b62..4f4adcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,6 +90,7 @@ release_build_release:
PACKAGE: 1
UPLOAD: 1
SYMBOL_TARGET: sapp
+ MEM_POOL: TCMALLOC_MINI
PULP3_REPO_NAME: platform-stable-x86_64.el7
PULP3_DIST_NAME: platform-stable-x86_64.el7
extends: .build_by_travis
@@ -111,6 +112,8 @@ testing_build_release:
PACKAGE: 1
UPLOAD: 1
SYMBOL_TARGET: sapp
+ ASAN_OPTION: ADDRESS
+ MEM_POOL: TCMALLOC
PULP3_REPO_NAME: platform-testing-x86_64.el7
PULP3_DIST_NAME: platform-testing-x86_64.el7
extends: .build_by_travis
diff --git a/ci/travis.sh b/ci/travis.sh
index 1880ed3..9b9abb5 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -33,8 +33,9 @@ env | sort
: "${COMPILER_IS_GNUCXX:=OFF}"
# Install dependency from YUM
+yum install -y libunwind gperftools
yum install -y mrzcpd numactl-devel zlib-devel librdkafka-devel systemd-devel
-yum install libMESA_htable-devel libMESA_prof_load-devel libcjson-devel libMESA_field_stat2-devel framework_env libwiredcfg-devel libWiredLB-devel libMESA_handle_logger-devel -y
+yum install libMESA_htable-devel libMESA_prof_load-devel libcjson-devel libMESA_field_stat2-devel framework_env libwiredcfg-devel libWiredLB-devel libMESA_handle_logger-devel libasan -y
source /etc/profile.d/framework.sh
mkdir build || true
@@ -46,6 +47,8 @@ cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-DENABLE_DEVEL=$ENABLE_DEVEL_SWITCH \
+ -DMEM_POOL=$MEM_POOL \
+ -DASAN_OPTION=$ASAN_OPTION \
..
make