From c8132c080c3cb7dcb633cce03f54372197167081 Mon Sep 17 00:00:00 2001
From: Isaac Turner <turner.isaac@gmail.com>
Date: Sun, 1 Nov 2015 06:13:23 +0000
Subject: [PATCH] Attempt to setup CoverityScan again

---
 .travis.yml       | 20 ++++++++++++++++++--
 configure         |  1 +
 travis/install.sh | 11 ++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100755 configure

diff --git a/.travis.yml b/.travis.yml
index 32259146..c650fcc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 # Travis CI configuration
+# Note: there are currently issues with limiting coverity to a single compiler
+#       see https://github.com/travis-ci/travis-ci/issues/1975
+#       Instead we use a script to decide if we should do anything
 
 language: c
 compiler: gcc
@@ -6,11 +9,24 @@ os: linux
 
 sudo: false
 
+# Multi language support on TravisCI would be nice
+# language: perl
+# perl: "5.20"
+
+before_install:
+  - git submodule update --init --recursive
+
+install:
+  - ./travis/install.sh
+  - eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)"
+
+script: ./travis/script.sh
+
 env:
   global:
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     #   via the "travis encrypt" command using the project repo's public key
-    - secure: "GFhh3zDi4MBYXIt7eDv+7rngKfx7oDZrtCqyM7sNN+LgHNkr6ZFpec+oJ/aAnD6KEtwyPAbGkSmyHoDWC6d4F0g1Ye41Xd9KzMXlHQoAnhJo1eesdWNky3cIenPvy4Xvy4i/5l2NtroLoboz7M5frWRN+rcrN/KenApd6lpJjGk="
+    - secure: "T08ccfH7+agMchVPhAP/MTdVeFonkjlLvbY8nv/jQ5aZeeWP2i1Oop59MVtuaA4Vw1Ickjr1czLsHGob2OyMHwo2otEasMqacvOw38exblvjOptqN7dx2yu0qzBZdHxLd/uOad7HMfgtkVSwgpodeNR6+K+4LcCM7J6+iAWtLME="
 
 addons:
   coverity_scan:
@@ -19,7 +35,7 @@ addons:
       description: Build submitted via Travis CI
     notification_email: turner.isaac@gmail.com
     build_command_prepend: git submodule update --init --recursive
-    build_command: make all
+    build_command: make
     branch_pattern: coverity_scan
 
 notifications:
diff --git a/configure b/configure
new file mode 100755
index 00000000..8b137891
--- /dev/null
+++ b/configure
@@ -0,0 +1 @@
+
diff --git a/travis/install.sh b/travis/install.sh
index 8077dd37..3a82f0f6 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -2,12 +2,10 @@
 
 set -e
 
-<<<<<<< HEAD
-cd libs && make && cd ..
-=======
-RUN_TRAVIS=`./travis/run.sh`
-
-if [ "$RUN_TRAVIS" == "yes" ]
+# The COVERITY_SCAN_BRANCH environment variable will be set to 1 when the
+# Coverity Scan addon is in operation
+# Only run if we are not doing Coverity Scan analysis
+if [ "${COVERITY_SCAN_BRANCH}" != 1 ]
 then
 
   # Set up cpanm, install JSON perl package
@@ -25,4 +23,3 @@ then
   cd libs && make && cd ..
 
 fi
->>>>>>> develop