summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-01-14 15:09:17 +0100
committerGitHub <noreply@github.com>2018-01-14 15:09:17 +0100
commit5dac1fc055ae4aa2ef2e49b0be428e46d348bc15 (patch)
treef343a5b4bacb330bd464720fffe40a4263c355ab
parent0080d1e4e6ca38074e4493ea6b05884d9b358519 (diff)
parent386b278b55466ceb8c8cddf18a71aee04ae90ec5 (diff)
downloadhercules-5dac1fc055ae4aa2ef2e49b0be428e46d348bc15.tar.gz
hercules-5dac1fc055ae4aa2ef2e49b0be428e46d348bc15.tar.bz2
hercules-5dac1fc055ae4aa2ef2e49b0be428e46d348bc15.tar.xz
hercules-5dac1fc055ae4aa2ef2e49b0be428e46d348bc15.zip
Merge pull request #1949 from 4144/travisfix
Disable leak detector on travis ci due mysql issue
-rwxr-xr-xtools/ci/travis.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh
index cc1f15ee8..59726efe8 100755
--- a/tools/ci/travis.sh
+++ b/tools/ci/travis.sh
@@ -203,6 +203,12 @@ EOF
ARGS="--load-plugin script_mapquit $ARGS --load-script npc/dev/ci_test.txt"
PLUGINS="--load-plugin HPMHooking --load-plugin sample"
echo "run tests"
+ if [[ $DBUSER == "travis" ]]; then
+ echo "Disable leak dection on travis"
+ export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=true:strict_init_order=true
+ else
+ export ASAN_OPTIONS=detect_leaks=1:detect_stack_use_after_return=true:strict_init_order=true
+ fi
# run_test spinlock # Not running the spinlock test for the time being (too time consuming)
run_test libconfig
echo "run all servers without HPM"