diff options
| author | 杨威 <[email protected]> | 2020-10-14 18:32:51 +0800 |
|---|---|---|
| committer | 杨威 <[email protected]> | 2020-10-14 18:32:51 +0800 |
| commit | 4942106aabb778c2742685ce94405202823458ef (patch) | |
| tree | d2034fdc74e70480b5c54e87d8f1f590c307c7b4 | |
| parent | dab58fabe19efbf9eef1f43dca0caf9ec58a242f (diff) | |
| parent | 28cfd57e985c3a04263a0a33044fa81037aa5419 (diff) | |
Merge branch 'patch-1' into 'master'
Update travis.sh, ASAN using devtoolset-7
See merge request tango/fw_dns_plug!6
| -rw-r--r-- | ci/travis.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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 |