aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-11-06 00:43:14 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-14 17:56:21 +0000
commit67385b184cd4939a301658c813e444f8dbb97813 (patch)
tree22a10caf00705edd5e1c11d7cbfbd0952b11517e /.travis.yml
parent70c326008367985fb1b88d142f3f422943a17a17 (diff)
travis: improve test matrix.
Details: - remove the original broken environments and create multi-variable ones - remove old comments - exclude some OSX builds Change-Id: Iec98d13350444678823fa52bb3b9faefe02859d6 Reviewed-on: https://code.wireshark.org/review/18689 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files changed, 13 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 733c57695a..59441f71cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,39 +8,35 @@ compiler:
- clang
- gcc
env:
- - BUILD_CMAKE=no
- BUILD_CMAKE=yes
- - CMAKE_GTK_OPTS="-DBUILD_wireshark_gtk=ON"
- - AUTOTOOLS_GTK_OPTS="--with-gtk=3"
-
+ - BUILD_CMAKE=yes CMAKE_OPTS="-DBUILD_wireshark_gtk=ON"
+ - BUILD_CMAKE=yes CMAKE_OPTS="-DENABLE_PCAP=OFF"
+ - BUILD_CMAKE=yes CMAKE_OPTS="-DENABLE_EXTCAP=OFF"
+ - BUILD_CMAKE=no AUTOTOOLS_OPTS="--with-gtk=3"
matrix:
exclude:
- #Exclude gcc build (Need some work) with osx
+ # Exclude gcc build (Need some work) with osx
- os: osx
compiler: gcc
- #Exclude autotools build (missing libtool...) with osx
+ # Exclude autotools build (missing libtool...) with osx
- os: osx
- env: BUILD_CMAKE=no
+ env: BUILD_CMAKE=no AUTOTOOLS_OPTS="--with-gtk=3"
+ # Exclude build with GTK+3
- os: osx
- env: CMAKE_GTK_OPTS="-DBUILD_wireshark_gtk=ON"
- - os: osx
- env: AUTOTOOLS_GTK_OPTS="--with-gtk=3"
+ env: BUILD_CMAKE=yes CMAKE_OPTS="-DBUILD_wireshark_gtk=ON"
before_install:
- echo $TRAVIS_OS_NAME
- $CC --version
-#macos
+ # macos
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
-#linux
+ # linux
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
- #libstdc++-4.8 is needed by Clang to build
+ # libstdc++-4.8 is needed by Clang to build
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq install libstdc++-4.8-dev; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi
-# - sudo apt-get -qq build-dep wireshark
-# - sudo apt-get -qq install cmake libgtk-3-0 libglib2.0-0 libgdk-pixbuf2.0-0 libcairo2
-# - sudo apt-get -qq install qt5-default qttools5-dev qttools5-dev-tools
- $CC --version
before_script:
- if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ${CMAKE_GTK_OPTS} ..; else ./autogen.sh && ./configure ${AUTOTOOLS_GTK_OPTS} ; fi
+ if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ${CMAKE_OPTS} ..; else ./autogen.sh && ./configure ${AUTOTOOLS_OPTS} ; fi
script:
- make