about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvanhauser-thc <vh@thc.org>2020-10-24 12:16:30 +0200
committervanhauser-thc <vh@thc.org>2020-10-24 12:16:30 +0200
commite5c2779d563ac3936d9b80d441b190b95c42638b (patch)
tree00bd8660917b87a4a79caf8518b71d5f4472f7da
parenteefc3608e7ef1c96f806395999028ebdec183b9d (diff)
downloadafl++-e5c2779d563ac3936d9b80d441b190b95c42638b.tar.gz
symbolize=1 for travis
-rw-r--r--.travis.yml2
-rwxr-xr-xtest/test-pre.sh8
2 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 93f1b899..b8b36e6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,5 +55,5 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LLVM_CONFIG=`pwd`/"$NAME" ; make source-only ASAN_BUILD=1 ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" -a "$TRAVIS_CPU_ARCH" = "amd64" ]; then make distrib ASAN_BUILD=1 ; fi
   - if [ "$TRAVIS_CPU_ARCH" = "arm64" ] ; then export LLVM_CONFIG=llvm-config-6.0 ; make ASAN_BUILD=1 ; cd qemu_mode && sh ./build_qemu_support.sh ; cd .. ; fi
-  - export ASAN_OPTIONS="abort_on_error=1:detect_leaks=0:symbolize=1" ; make tests
+  - make tests
 #  - travis_terminate 0
diff --git a/test/test-pre.sh b/test/test-pre.sh
index e3393962..fc14ee0b 100755
--- a/test/test-pre.sh
+++ b/test/test-pre.sh
@@ -93,7 +93,13 @@ unset LD_PRELOAD
 
 rm -rf in in2 out
 
-export ASAN_OPTIONS=detect_leaks=0:allocator_may_return_null=1:abort_on_error=1:symbolize=0
+test -z "$TRAVIS_OS_NAME" && {
+  export ASAN_OPTIONS=detect_leaks=0:allocator_may_return_null=1:abort_on_error=1:symbolize=0
+}
+test -n "$TRAVIS_OS_NAME" && {
+  export ASAN_OPTIONS=detect_leaks=0:allocator_may_return_null=1:abort_on_error=1:symbolize=1
+}
+
 export AFL_LLVM_INSTRUMENT=AFL
 
 # on OpenBSD we need to work with llvm from /usr/local/bin