From fd7bb9f409e625d3aee26de460ea3108b5e8d37d Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Fri, 16 May 2014 11:06:04 +0200 Subject: [PATCH] travis: don't use regular options when on coverity branch --- .travis.yml | 5 +++-- .travis/install.sh | 15 +++++++++++---- .travis/run.sh | 15 +++++++++++---- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87ca3c66..3fb1359a 100644 --- 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 153443ba..eb52b771 100755 --- 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 419e43a9..3174186d 100755 --- 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 -- 2.39.5