diff options
| author | RALOVICH, Kristof <tade60@freemail.hu> | 2014-08-17 15:15:03 +0200 |
|---|---|---|
| committer | RALOVICH, Kristof <tade60@freemail.hu> | 2014-08-17 15:15:03 +0200 |
| commit | 74d8589acc78ecd5e276bf9c795b354e1df59091 (patch) | |
| tree | 930aece59204eb703a6e2891fbab9b445d7ee5bb | |
| parent | 89d360e47d0ad3734a70dca539a02b1ff28774d0 (diff) | |
travis-ci: don't run coverity with gcc
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | scripts/coverity_scan_script.sh | 23 |
2 files changed, 8 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 921dc6a..5c86a3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # -*- coding: iso-8859-2-unix -*- env: global: - - secure: "DF3a8vcQ7iU7AA4Ons5Ct05G/nhvr7bM8hYHd9B7x7h9tzaGJUgnESXCqiejtoR72fR626iGRXpD/O3h0pvj3OS9IywkuUXaNetnse8/xGZ+aKX+w7Dzvrrg8Q/07xazoR6cIzNJ/FyWWoKoY71gIMRHeOx5pebHyRkIxxFbUIw=" + - secure: "I1Jdwk4mbz9YjiYEMeMwWZjrBz1oauuGyW/WNOkdq4FkfyPFQcwvU/VnefIGnXCZ7YBS6tuXY8DNQZC0CSWPusebYCKHDdTiiQlcmQ3+L/UPy5a8jABwASHTXsJtte4S5hUq+KLzzBtMmsBwMT2xWO2zskuOkq6tFIqP4N3hfag=" addons: coverity_scan: @@ -10,7 +10,7 @@ addons: 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" - build_command: "make -j 4" + build_command: "make" 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 23429d6..dfe5d83 100755 --- a/scripts/coverity_scan_script.sh +++ b/scripts/coverity_scan_script.sh @@ -17,6 +17,12 @@ TOOL_BASE=/tmp/coverity-scan-analysis UPLOAD_URL="https://scan.coverity.com/builds" SCAN_URL="https://scan.coverity.com" +# Do not run with clang +if [ "${CC}" = "clang" ]; then + echo -e "\033[33;1mINFO: Skipping Coverity Analysis: clang compiler.\033[0m" + exit 0 +fi + # Do not run on pull requests if [ "${TRAVIS_PULL_REQUEST}" = "true" ]; then echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m" @@ -65,29 +71,14 @@ fi TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'` export PATH=$TOOL_DIR/bin:$PATH -echo $PATH # Build echo -e "\033[33;1mRunning Coverity Scan Analysis Tool....\033[0m" 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 "++++++++++++++++++++++++++++++" -cat $RESULTS_DIR/build-log.txt -echo "++++++++++++++++++++++++++++++" -pwd -cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND -echo "++++++++++++++++++++++++++++++" -cat $RESULTS_DIR/build-log.txt -echo "++++++++++++++++++++++++++++++" -pwd cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1 # Upload results @@ -96,8 +87,6 @@ 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" \ |