travis: don't use regular options when on coverity branch

diff --git a/.travis.yml b/.travis.yml
index 87ca3c66d66ab6905b47e02be9d6b32f45638dff..3fb1359aac2119ee47622437b39ec7767e8d72a0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ script:
 env:
   global:
     - secure: "1qAHFxnz0gIxMMl9DAVzoPvVSpOacWT2G6ItcaoaVe1r4OANzpoHBlbyHX2I/1KFe+BohzjS9kXA4NrlPaL81qfvu9E6qZ9yai/+0gHdzZttB2uvdyFXyDVye3CHHDlYMfRRQf6C+eYs5CKeedWq9Q3arO1GyAWiL9RcW1466sg="
+    - COVERITY_SCAN_BRANCH_PATTERN=coverity_scan
+    - COVERITY_SCAN_NOTIFICATION_EMAIL="bernat@luffy.cx"
+    - RUN_COVERITY=0
   matrix:
     - LLDPD_CONFIG_ARGS=""
     - LLDPD_CONFIG_ARGS="--with-embedded-libevent"
@@ -29,5 +32,3 @@ matrix:
       env:
         - LLDPD_CONFIG_ARGS="--with-snmp --with-xml --with-json"
         - RUN_COVERITY=1
-        - COVERITY_SCAN_BRANCH_PATTERN=coverity_scan
-        - COVERITY_SCAN_NOTIFICATION_EMAIL="bernat@luffy.cx"

diff --git a/.travis/install.sh b/.travis/install.sh
index 153443ba237e4c93ac50fa44bca2b8f3f344d069..eb52b7711a7ccd17fccc6601dabc115b84c0249a 100755 (executable)
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -4,10 +4,17 @@
 
 set -e
 
-if [ x"${RUN_COVERITY}" = x"1" ] && \
-    [ x"${COVERITY_SCAN_BRANCH_PATTERN}" != x"${TRAVIS_BRANCH}" ]; then
-    exit 0
-fi
+case "${RUN_COVERITY}","${TRAVIS_BRANCH}" in
+    0,"${COVERITY_SCAN_BRANCH_PATTERN}")
+        exit 0
+        ;;
+    1,"${COVERITY_SCAN_BRANCH_PATTERN}")
+        # OK
+        ;;
+    1,*)
+        exit 0
+        ;;
+esac
 
 case "$(uname -s)" in
     Darwin)

diff --git a/.travis/run.sh b/.travis/run.sh
index 419e43a9ee79770599bf369d7c2d3de583a8732d..3174186df142421ac6a80c6cca8e2f777cb4add6 100755 (executable)
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -2,10 +2,17 @@
 
 set -e
 
-if [ x"${RUN_COVERITY}" = x"1" ] && \
-    [ x"${COVERITY_SCAN_BRANCH_PATTERN}" != x"${TRAVIS_BRANCH}" ]; then
-    exit 0
-fi
+case "${RUN_COVERITY}","${TRAVIS_BRANCH}" in
+    0,"${COVERITY_SCAN_BRANCH_PATTERN}")
+        exit 0
+        ;;
+    1,"${COVERITY_SCAN_BRANCH_PATTERN}")
+        # OK
+        ;;
+    1,*)
+        exit 0
+        ;;
+esac
 
 ./autogen.sh
 ./configure $LLDPD_CONFIG_ARGS