diff options
| author | van Hauser <vh@thc.org> | 2019-12-05 15:12:28 +0100 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2019-12-05 15:12:28 +0100 |
| commit | d08504a667e2c2e0bee6201a728a3ca342833a41 (patch) | |
| tree | 0af3e2ee8c0f9d2dbf95258fb690f02066224ad6 | |
| parent | 08f2a35b9ba15dce1ab914bd859a34d3ef2e50e7 (diff) | |
| download | afl++-d08504a667e2c2e0bee6201a728a3ca342833a41.tar.gz | |
travis enhancement
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | test/test.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 4a35df33..1c744df2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,14 @@ matrix: env: NAME="bionic-amd64" MODERN="yes" GCC="7" - os: linux dist: xenial - env: NAME="xenial-amd64" MODERN="no" GCC="5" EXTRA="libtool-bin" + env: NAME="xenial-amd64" MODERN="no" GCC="5" EXTRA="libtool-bin clang-6.0" - os: linux dist: trusty env: NAME="trusty-amd64" MODERN="no" GCC="4.8" - os: linux dist: xenial arch: arm64 - env: NAME="xenial-arm64" MODERN="no" GCC="5" EXTRA="libtool-bin" AFL_NO_X86="1" CPU_TARGET="aarch64" + env: NAME="xenial-arm64" MODERN="no" GCC="5" EXTRA="libtool-bin clang-6.0" AFL_NO_X86="1" CPU_TARGET="aarch64" # - os: osx # osx_image: xcode11.2 # env: NAME="osx" HOMEBREW_NO_ANALYTICS="1" LINK="http://releases.llvm.org/9.0.0/" NAME="clang+llvm-9.0.0-x86_64-darwin-apple" @@ -37,8 +37,8 @@ before_install: # export LLVM_DIR=${TRAVIS_BUILD_DIR}/${LLVM_PACKAGE} - echo Testing on $NAME - if [ "$TRAVIS_OS_NAME" = "osx" ]; then wget "$LINK""$NAME".tar.xz ; export LLVM_CONFIG=`pwd`/"$NAME" ; tar xJf "$NAME".tar.xz ; fi - - if [ "$MODERN" = "yes" ]; then sudo apt update ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc-7 gcc-7-plugin-dev libc++-7-dev ; fi - - if [ "$MODERN" = "no" ]; then sudo apt update ; apt-cache search clang ; sudo apt install -y libtool $EXTRA automake bison libglib2.0 build-essential clang-6.0 gcc gcc-"$GCC"-plugin-dev libc++-dev ; fi + - if [ "$MODERN" = "yes" ]; then sudo apt update ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc-"$GCC" gcc-"$GCC"-plugin-dev libc++-"$GCC"-dev ; fi + - if [ "$MODERN" = "no" ]; then sudo apt update ; sudo apt install -y libtool $EXTRA automake bison libglib2.0 build-essential gcc-"$GCC" gcc-"$GCC"-plugin-dev libc++-dev ; fi script: - gcc -v diff --git a/test/test.sh b/test/test.sh index 62ff1d90..bf1cd347 100755 --- a/test/test.sh +++ b/test/test.sh @@ -145,7 +145,7 @@ test -e ../${AFL_GCC} -a -e ../afl-showmap -a -e ../afl-fuzz && { } $ECHO "$BLUE[*] Testing: llvm_mode" -test -e ../afl-clang-fast && { +test -e ../afl-clang-fast -a -e ../split-switches-pass.so && { # on FreeBSD need to set AFL_CC if which clang >/dev/null; then export AFL_CC=`which clang` @@ -302,7 +302,7 @@ test -e ../afl-gcc-fast -a -e ../afl-gcc-rt.o && { } || { $ECHO "$RED[!] gcc_plugin instrumentation produces a weird number of instrumented locations: $TUPLES" $ECHO "$YELLOW[!] the gcc_plugin instrumentation issue is not flagged as an error because travis builds would all fail otherwise :-(" - CODE=0 + #CODE=1 } } } || { |