diff options
| -rw-r--r-- | .travis.yml | 98 | ||||
| -rw-r--r-- | configure.seed | 3 |
2 files changed, 78 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 9c4fc859c..4de6f474d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,84 @@ language: c -os: - - osx - - linux +matrix: + include: + - os: osx + compiler: clang -compiler: - - clang - - gcc + - os: linux + compiler: gcc + addons: + apt: + packages: + - libpcap-dev + - autogen -matrix: - exclude: - # osx use always clang for build... - - os: osx - compiler: gcc - -install: -#macos - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi -#linux - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update || true; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install build-essential; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libpcap-dev libtool autoconf automake autogen; fi + - os: linux + compiler: clang + addons: + apt: + packages: + - libpcap-dev + - autogen + + - os: linux + compiler: gcc-8 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-8 + - libpcap-dev + - autogen + env: + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + + - os: linux + compiler: gcc-9 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-9 + - libpcap-dev + - autogen + env: + - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + + - os: linux + compiler: clang-8 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-8 + packages: + - clang-8 + - libpcap-dev + - autogen + env: + - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" + + - os: linux + compiler: clang-7 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + packages: + - clang-7 + - libpcap-dev + - autogen + env: + - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" + + + + before_install: + - eval "${MATRIX_EVAL}" before_script: - ./autogen.sh @@ -29,7 +87,7 @@ before_script: script: - ./configure - make -# + #after_script: - cd tests - ./do.sh diff --git a/configure.seed b/configure.seed index fbc30ae07..9d60c8944 100644 --- a/configure.seed +++ b/configure.seed @@ -69,9 +69,6 @@ if test $SYSTEM = "Darwin"; then CC=clang fi -if test $ax_cv_PTHREAD_CLANG = "yes"; then - CC=clang -fi HS_LIB= HS_INC= |