From: Denis Ovsienko <infrastation@yandex.ru>
Date: Tue, 26 Nov 2013 15:36:52 +0000 (+0400)
Subject: skip "make check" for Travis builds w/o IPv6
X-Git-Tag: tcpdump-4.6.0~328^2~3
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/77660a50c52cace763ec1b19645fa05835d72803

skip "make check" for Travis builds w/o IPv6

tcpdump can build w/o IPv6 but its output will differ in many test
cases. Make sure test cases are only used with IPv4+IPv6 builds.
---

diff --git a/.travis.yml b/.travis.yml
index 56747312..456ed53c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,14 @@ compiler:
   - clang
 
 env:
-  - BUILD_LIBPCAP=true CONFARGS=''
-  - BUILD_LIBPCAP=true CONFARGS='--disable-ipv6'
+  - BUILD_LIBPCAP=true BUILD_IPV6=true
+  - BUILD_LIBPCAP=true BUILD_IPV6=false
 
 before_script:
   - sudo apt-get install libssl-dev libssl0.9.8 libssl1.0.0
   - if [ $BUILD_LIBPCAP == "true" ]; then ( cd ../ && git clone git://github.com/the-tcpdump-group/libpcap.git && cd libpcap && ./configure && make ); else sudo apt-get install libpcap-dev; fi
 
 script:
-  - ./configure $CONFARGS
+  - if [ "$BUILD_IPV6" = "true" ]; then ./configure; else ./configure --disable-ipv6; fi
   - make
-  - make check
+  - if [ "$BUILD_IPV6" = "true" ]; then make check; else true; fi