From f8b57e68586505af4ef38a6ff5d35b2fd1ad5f48 Mon Sep 17 00:00:00 2001
From: "RALOVICH, Kristof" <tade60@freemail.hu>
Date: Sat, 9 Aug 2014 19:30:35 +0200
Subject: travis-ci: refine coverity setup

---
 .travis.yml                     |  2 +-
 scripts/coverity_scan_script.sh | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ce41fe..921dc6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ addons:
       name: "ralovich/antpm"
       description: "ANT+minus Build submitted via Travis CI"
     notification_email: ralovich@in.tum.de
-    build_command_prepend: "pwd && cd cmake-build && pwd && cmake ../src -DCMAKE_BUILD_TYPE=Debug -DUSE_BOOST_TEST=TRUE -DCMAKE_INSTALL_PREFIX=/usr && make clean"
+    build_command_prepend: "pwd && cd cmake-build && pwd && cmake ../src -DCMAKE_BUILD_TYPE=Debug -DUSE_BOOST_TEST=TRUE"
     build_command:   "make -j 4"
     branch_pattern: coverity_scan
     build_script_url: "https://raw.githubusercontent.com/ralovich/antpm/master/scripts/coverity_scan_script.sh"
diff --git a/scripts/coverity_scan_script.sh b/scripts/coverity_scan_script.sh
index b645739..23429d6 100755
--- a/scripts/coverity_scan_script.sh
+++ b/scripts/coverity_scan_script.sh
@@ -59,7 +59,7 @@ if [ ! -d $TOOL_BASE ]; then
   echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
   mkdir -p $TOOL_BASE
   pushd $TOOL_BASE
-  tar xzvf $TOOL_ARCHIVE
+  tar xzf $TOOL_ARCHIVE
   popd
 fi
 
@@ -73,16 +73,19 @@ COV_BUILD_OPTIONS=""
 #COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"
 RESULTS_DIR="cov-int"
 pwd
+echo "COVERITY_SCAN_BUILD_COMMAND_PREPEND=${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
 eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
 pwd
+ls -las
+echo "CB=cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND"
 COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
 echo "++++++++++++++++++++++++++++++"
-tail $RESULTS_DIR/build-log.txt
+cat $RESULTS_DIR/build-log.txt
 echo "++++++++++++++++++++++++++++++"
 pwd
 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
 echo "++++++++++++++++++++++++++++++"
-tail $RESULTS_DIR/build-log.txt
+cat $RESULTS_DIR/build-log.txt
 echo "++++++++++++++++++++++++++++++"
 pwd
 cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
@@ -93,6 +96,8 @@ RESULTS_ARCHIVE=analysis-results.tgz
 tar czvf $RESULTS_ARCHIVE $RESULTS_DIR
 SHA=`git rev-parse --short HEAD`
 
+exit 0
+
 echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
 response=$(curl \
   --silent --write-out "\n%{http_code}\n" \
-- 
cgit v1.2.3