]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Travis: The '--disable-ipv6' configure option was eliminated
authorFrancois-Xavier Le Bail <[email protected]>
Fri, 18 Sep 2015 10:00:57 +0000 (12:00 +0200)
committerFrancois-Xavier Le Bail <[email protected]>
Fri, 18 Sep 2015 10:00:57 +0000 (12:00 +0200)
.travis.yml

index 57e31cdae3e1e8e41b70ed096d20317156bfa5d2..4a944c6755a6b6f992b5e14bdfe07d0a100b327f 100644 (file)
@@ -17,13 +17,10 @@ env:
     - secure: "pcl5WdUhdnG5VpiyIKkVkNimnkvrnbWb8YOgw2ERJ0qNqIaF/Re4qV/rDXYe+AkRwAR071HQW6KlDnpeUlHKPNhmfzeUlmOxSatvdVPw+FV5KqOuidZbHDH/RiWvvlOyaJq26aDExFSDxV+98v39q+n1jNSqggHLe8o48zVK/+U="
     # Coverity run condition (avoid matrix multiple runs), need customized
     # build script. Need an update if new matrix cases.
-    - coverity_scan_run_condition='"$TRAVIS_OS_NAME" = linux -a "$CC" = gcc -a "$BUILD_IPV6" = true'
+    - coverity_scan_run_condition='"$TRAVIS_OS_NAME" = linux -a "$CC" = gcc'
     # Coverity script test mode (if true no uploading, avoid reaching the quota)
     # usual processing: false.
     - coverity_scan_script_test_mode=false
-  matrix:
-    - BUILD_IPV6=true
-    - BUILD_IPV6=false
 
 addons:
   coverity_scan:
@@ -69,7 +66,7 @@ before_script:
 
 script:
   - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then touch .devel configure; fi
-  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then if [ "$BUILD_IPV6" = true ]; then ./configure --prefix=/tmp; else ./configure --prefix=/tmp --disable-ipv6; fi; fi
+  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ./configure --prefix=/tmp; fi
   - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -s; fi
   - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then PATH=$PATH make install; fi
-  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then if [ "$BUILD_IPV6" = true ]; then make check; fi; fi
+  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make check; fi