From: Denis Ovsienko Date: Fri, 18 Apr 2014 21:35:58 +0000 (+0400) Subject: Merge remote-tracking branch 'bpf/master' X-Git-Tag: libpcap-1.6.0-bp~22 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/72ee86ce2c386508bea45df655e0894a6b47973c?hp=deca4cdc6a12fade79ee4124e4dca267e961c373 Merge remote-tracking branch 'bpf/master' bpf.tcpdump.org and GitHub have diverged again. --- diff --git a/.travis-coverity-scan-build.sh b/.travis-coverity-scan-build.sh new file mode 100644 index 00000000..92e3f653 --- /dev/null +++ b/.travis-coverity-scan-build.sh @@ -0,0 +1,109 @@ +#!/bin/sh + +set -e + +# Environment check +echo -e "\033[33;1mNote: PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m" +[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1 +#[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1 +[ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1 +[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1 +[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1 + +PLATFORM=`uname` +TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz +TOOL_URL=https://scan.coverity.com/download/${PLATFORM} +TOOL_BASE=/tmp/coverity-scan-analysis +UPLOAD_URL="http://scan5.coverity.com/cgi-bin/travis_upload.py" +SCAN_URL="https://scan.coverity.com" + +# Verify Coverity Scan run condition +COVERITY_SCAN_RUN_CONDITION=${coverity_scan_run_condition:-true} +echo -ne "\033[33;1mTesting '${COVERITY_SCAN_RUN_CONDITION}' condition... " +if eval [ $COVERITY_SCAN_RUN_CONDITION ]; then + echo -e "True.\033[0m" +else + echo -e "False. Exit.\033[0m" + exit 1 +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" + exit 0 +fi + +# Verify this branch should run +IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"` +if [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then + echo -e "\033[33;1mCoverity Scan configured to run on branch ${TRAVIS_BRANCH}\033[0m" +else + echo -e "\033[33;1mCoverity Scan NOT configured to run on branch ${TRAVIS_BRANCH}\033[0m" + exit 1 +fi + +# Verify upload is permitted +AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted` +if [ "$AUTH_RES" = "Access denied" ]; then + echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" + exit 1 +else + AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"` + if [ "$AUTH" = "true" ]; then + echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" + else + WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"` + echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" + exit 1 + fi +fi + +if [ ! -d $TOOL_BASE ]; then + # Download Coverity Scan Analysis Tool + if [ ! -e $TOOL_ARCHIVE ]; then + echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m" + wget -nv -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN" + fi + + # Extract Coverity Scan Analysis Tool + echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m" + mkdir -p $TOOL_BASE + pushd $TOOL_BASE + tar xzf $TOOL_ARCHIVE + popd +fi + +TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'` +export PATH=$TOOL_DIR/bin:$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" +eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}" +COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND + +# Upload results +echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m" +RESULTS_ARCHIVE=analysis-results.tgz +tar czf $RESULTS_ARCHIVE $RESULTS_DIR +SHA=`git rev-parse --short HEAD` +VERSION_SHA=$(cat VERSION)#$SHA + +# Verify Coverity Scan script test mode +if [ "$coverity_scan_script_test_mode" = true ]; then + echo -e "\033[33;1mCoverity Scan configured in script test mode. Exit.\033[0m" + exit 1 +fi + +echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m" +curl \ + --progress-bar \ + --form project=$COVERITY_SCAN_PROJECT_NAME \ + --form token=$COVERITY_SCAN_TOKEN \ + --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \ + --form file=@$RESULTS_ARCHIVE \ + --form version=$SHA \ + --form description="$VERSION_SHA" \ + $UPLOAD_URL diff --git a/.travis.yml b/.travis.yml index 2c596159..40485ffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,41 @@ compiler: - gcc - clang +env: + global: + # encrypted COVERITY_SCAN_TOKEN from + # https://scan.coverity.com/projects//submit_build?tab=travis_ci + - secure: "E7nrxhoBrST9SOy6PM+IN89k1EznzXWgsKSvB+fK2oNdLxAD+jaFCbG4JGwYzFzSwmBgd7NEQGSJi4uYotsvBPSxPBwiA/tQPniPvUd/dahTQxB1eJlYb+/hMYuumCHHK09zmPbTNU/v7qLc+NgMUM5bTCUG62dErFkx03WeHPM=" + # Coverity run condition (avoid matrix multiple runs), need customized + # build script. Need an update if new matrix cases. + - coverity_scan_run_condition='"$CC" = gcc' + # Coverity script test mode (if true no uploading, avoid reaching the quota) + # usual processing: false. + - coverity_scan_script_test_mode=false + +addons: + coverity_scan: + # customized build script URL + # TRAVIS_REPO_SLUG: owner_name/repo_name of repository currently being built + # TRAVIS_BRANCH: name of the branch currently being built + build_script_url: https://raw.githubusercontent.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/.travis-coverity-scan-build.sh + # project metadata + project: + name: $TRAVIS_REPO_SLUG + # Where email notification of build analysis results will be sent + notification_email: tcpdump-workers@lists.tcpdump.org + # Commands to prepare for build_command + build_command_prepend: ./configure + # This command will be added as an argument to "cov-build" to compile + # the project for analysis + build_command: make + # Pattern to match selecting branches that will run analysis + branch_pattern: coverity_scan + before_script: - sudo apt-get install libusb-1.0-0-dev libdbus-1-dev script: - - ./configure - - make -s + - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then touch .devel configure; fi + - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ./configure; fi + - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -s; fi