diff options
| author | luwenpeng <[email protected]> | 2020-10-15 10:05:46 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2020-10-15 19:46:35 +0800 |
| commit | 0af5267002888090fc39196b86c8d79bf7362f46 (patch) | |
| tree | 7a8ffd1e4a4fe9231dd6bd6b4a15de41c9bc98f6 | |
| parent | 24f79a5a2050f6ee538e844b957bf79ac866b783 (diff) | |
asan using devtoolset-7
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ci/travis.sh | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd6ff54..cf66410 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,7 @@ develop_build_debug: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug + ASAN_OPTION: ADDRESS PACKAGE: 1 PULP3_REPO_NAME: tfe-testing-x86_64.el7 PULP3_DIST_NAME: tfe-testing-x86_64.el7 @@ -64,6 +65,7 @@ develop_build_release: variables: TESTING_VERSION_BUILD: 1 UPLOAD_SYMBOL_FILES: 1 + ASAN_OPTION: ADDRESS BUILD_TYPE: RelWithDebInfo PACKAGE: 1 PULP3_REPO_NAME: tfe-testing-x86_64.el7 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1efdd1b..3f3a69d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,10 +21,10 @@ endif() option(ENABLE_PIC "Generate position independent code (necessary for shared libraries)" TRUE) option(ENABLE_WARNING_ALL "Enable all optional warnings which are desirable for normal code" TRUE) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - option(ENABLE_SANITIZE_ADDRESS "Enable AddressSanitizer" TRUE) -else() +if(NOT ASAN_OPTION) option(ENABLE_SANITIZE_ADDRESS "Enable AddressSanitizer" FALSE) +else() + option(ENABLE_SANITIZE_ADDRESS "Enable AddressSanitizer" TRUE) endif() option(ENABLE_SANITIZE_THREAD "Enable ThreadSanitizer" FALSE) diff --git a/ci/travis.sh b/ci/travis.sh index d64dab7..8e93bfc 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -38,11 +38,16 @@ yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libME yum install -y libMESA_htable-devel libMESA_prof_load-devel librulescan-devel libwiredcfg-devel libWiredLB-devel sapp-devel yum install -y libasan +if [ $ASAN_OPTION ];then + source /opt/rh/devtoolset-7/enable +fi + mkdir build || true cd build cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -DASAN_OPTION=$ASAN_OPTION \ -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \ -DTFE_VERSION_DAILY_BUILD=$TESTING_VERSION_BUILD \ .. |