From 4e21b2378f711c4da42cc3267961daca8fb2a08e Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 23 Apr 2017 19:40:57 -0400
Subject: [PATCH] travis-ci coverity optimization

---
 .travis.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5a0cc66cd..14a5e000de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,10 @@ cache:
   ccache: true
 
 before_install:
-  - if [[ "${BUILD_TARGET}" = "coverity_scan" && "${TRAVIS_BRANCH}" == "coverity" ]]; then sudo apt-get install genromfs && pip install empy jinja2; fi
+  # install dependencies for the coverity build (target and branch), otherwise exit early
+  - if [[ "${TRAVIS_BRANCH}" = "coverity" ]]; then
+      if [[ "${BUILD_TARGET}" = "coverity_scan" ]]; then sudo apt-get install genromfs && pip install empy jinja2; else exit 0; fi;
+    fi
 
 env:
   global:
@@ -60,9 +63,9 @@ env:
     - secure: "h6oajlW68dWIr+wZhO58Dv6e68dZHrBLVA6lPXZmheFQBW6Xam1HuLGA0LOW6cL9TnrAsOZ8g4goB58eMQnMEijFZKi3mhRwZhd/Xjq/ZGJOWBUrLoQHZUw2dQk5ja5vmUlKEoQnFZjDuMjx8KfX5ZMNy8A3yssWZtJYHD8c+bk="
 
 script:
-  - if [[ "${TRAVIS_BRANCH}" == "coverity" && "${BUILD_TARGET}" == "coverity_scan" ]]; then
+  - if [[ "${BUILD_TARGET}" = "coverity_scan" ]]; then
       echo "no script for coverity build";
-    elif [[ "${TRAVIS_BRANCH}" == "coverity" && "${BUILD_TARGET}" != "coverity_scan" ]]; then
+    elif [[ "${TRAVIS_BRANCH}" = "coverity" ]]; then
       echo "exit early for coverity build" && exit 0;
     elif [[ "${BUILD_TARGET}" = "check_format" ]]; then
       ./Tools/docker_run.sh 'make check_format';
@@ -80,15 +83,15 @@ script:
 
 after_success:
   # s3 deploy airframe and parameter metadata
-  - if [[ "${BUILD_TARGET}" = "px4_metadata" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
+  - if [[ "${BUILD_TARGET}" = "px4_metadata" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
          ./Tools/docker_run.sh 'make s3put_px4_metadata AWS_S3_BUCKET="px4-travis/Firmware/${TRAVIS_BRANCH}"';
     fi
   # s3 upload clang scan-build output for master branch
-  - if [[ "${BUILD_TARGET}" = "scan-build" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" ]]; then
+  - if [[ "${BUILD_TARGET}" = "scan-build" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
          ./Tools/docker_run.sh 'make s3put_scan-build AWS_S3_BUCKET="px4-travis/scan-build"';
     fi
   # coveralls code coverage report
-  - if [[ "${BUILD_TARGET}" = "tests_coverage" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
+  - if [[ "${BUILD_TARGET}" = "tests_coverage" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
          ./Tools/docker_run.sh 'cpp-coveralls -l coverage.info';
     fi