]> The Tcpdump Group git mirrors - tcpdump/commitdiff
skip "make check" for Travis builds w/o IPv6
authorDenis Ovsienko <[email protected]>
Tue, 26 Nov 2013 15:36:52 +0000 (19:36 +0400)
committerDenis Ovsienko <[email protected]>
Tue, 26 Nov 2013 15:36:52 +0000 (19:36 +0400)
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.

.travis.yml

index 56747312ff8c8e6c58b9e210c864f3ed36053115..456ed53c38cb9bd7c51410660b34fd00c663f129 100644 (file)
@@ -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