Integrating a working coverity_scan travis rule back into master.

diff --git a/.travis.yml b/.travis.yml
index b1b8e01177e6c572803ffdb427d9be3ba07c7a69..bb707536c14624d250090825f42b61f60df6e9fc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,24 +100,43 @@ script:
    [ -n "$TRAVIS_CVC4" ] && [ -n "$TRAVIS_CVC4_DISTCHECK" ] && run makeDistcheck
    [ -n "$TRAVIS_CVC4" ] && [ -z "$TRAVIS_CVC4_DISTCHECK" ] && run makeCheck && run makeCheckPortfolio && run makeExamples
    [ -n "$TRAVIS_LFSC" ] && run LFSCchecks
-   [ -z "$TRAVIS_CVC4" ] && [ -z "$TRAVIS_LFSC" ] && error "Unknown Travis-CI configuration"
+   [ -n "$TRAVIS_COVERITY" ] && echo "Running coverity. Skipping the normal build."
+   [ -z "$TRAVIS_CVC4" ] && [ -z "$TRAVIS_LFSC" ] && [ -z "$TRAVIS_COVERITY" ] && error "Unknown Travis-CI configuration"
    echo "travis_fold:end:load_script"
  - echo; echo "${green}EVERYTHING SEEMED TO PASS!${normal}"
 matrix:
   fast_finish: true
+  # Rule for running Coverity Scan.
   include:
     - os: linux
       compiler: gcc
       before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+      env:
+        - TRAVIS_COVERITY=yes CVC4_REGRESSION_ARGS='--no-early-exit'  CXXTEST="$HOME/cxxtest"
       addons:
+        # Need to duplicate as addons will be over written.
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - libgmp-dev
+            - libboost-dev
+            - libboost-thread-dev
+            - swig
+            - libcln-dev
+            - openjdk-7-jdk
+            - antlr3
+            - libantlr3c-dev
         coverity_scan:
           project:
             name: "CVC4/CVC4"
             description: "Build submitted via Travis CI"
           notification_email: timothy.alan.king@gmail.com
-          build_command_prepend: "./autogen.sh; ./configure --enable-unit-testing --enable-proof CXXTEST=$HOME/cxxtest"
-          build_command: "make V=1 -j4 check CVC4_REGRESSION_ARGS='--no-early-exit'"
+          build_command_prepend: "./autogen.sh; ./configure --enable-unit-testing --enable-proof"
+          build_command: "make V=1 -j4 check"
           branch_pattern: coverity_scan
+      after_failure:
+        - cat /home/travis/build/CVC4/CVC4/cov-int/build-log.txt
 notifications:
   email:
     on_success: change