aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2019-12-02 16:27:03 +0100
committervan Hauser <vh@thc.org>2019-12-02 16:27:03 +0100
commit523859f37c511a56009404f7ea4ad768a4f51127 (patch)
tree8bd0a7fb74d05c4b5dc46357152a45444a872048
parent0894f8cf7a1317d92b578fe5aa1a4ba5b823e355 (diff)
downloadafl++-523859f37c511a56009404f7ea4ad768a4f51127.tar.gz
further travis tweaking
-rw-r--r--.travis.yml16
1 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 6965747d..9b22ec3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,20 @@ matrix:
include:
- os: linux
dist: bionic
- env: MODERN="yes"
+ env: NAME="bionic-amd64" MODERN="yes" GCC="7"
- os: linux
dist: xenial
- env: MODERN="no"
+ env: NAME="xenial-amd64" MODERN="no" GCC="5"
- os: linux
dist: trusty
- env: MODERN="no"
+ env: NAME="trusty-amd64" MODERN="no" GCC="4.8"
- os: linux
dist: xenial
arch: arm64
- env: MODERN="no" CPU_TARGET="aarch64-softmmu"
+ env: NAME="xenial-arm64" MODERN="no" GCC="5" CPU_TARGET="aarch64-softmmu"
- os: osx
osx_image: xcode11.2
- env: HOMEBREW_NO_ANALYTICS=1
+ 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"
jobs:
allow_failures:
@@ -34,9 +34,11 @@ env:
# - AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 AFL_NO_UI=1 AFL_BENCH_JUST_ONE=1
before_install:
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew upgrade ; brew install --with-toolchain gcc ; brew install --with-toolchain llvm ; fi
+ # export LLVM_DIR=${TRAVIS_BUILD_DIR}/${LLVM_PACKAGE}
+ - echo Testing on $NAME
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew install wget ; brew install gcc ; wget "$LINK""$NAME".tar.xz ; pushd /usr/local ; sudo tar xjf "$NAME".tar.xz ; popd ; 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 plugin-dev|grep gcc ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc gcc-plugin-dev libc++-dev ; fi
+ - if [ "$MODERN" = "no" ]; then sudo apt update ; apt-cache search plugin-dev|grep gcc ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc gcc-"$GCC"-plugin-dev libc++-dev ; fi
script:
- gcc -v