summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>2014-10-17 11:41:05 +0300
committerJakub Hrozek <jhrozek@redhat.com>2014-10-22 12:55:26 +0200
commite373fffbb8e06d0d7682d095c734e8df8a499ba0 (patch)
treebf657a3063864dd1c68ac18258efcca545673935 /contrib
parent35863245aa8b8404caedfc95e68b3aa5af14542e (diff)
downloadsssd-e373fffbb8e06d0d7682d095c734e8df8a499ba0.tar.gz
sssd-e373fffbb8e06d0d7682d095c734e8df8a499ba0.tar.xz
sssd-e373fffbb8e06d0d7682d095c734e8df8a499ba0.zip
CI: Remove Clang analyzer
Remove Clang analyzer run from contrib/ci/run as it takes a long time (5-8 minutes) and its results are unused. Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ci/deps.sh1
-rw-r--r--contrib/ci/misc.sh43
-rwxr-xr-xcontrib/ci/run21
3 files changed, 5 insertions, 60 deletions
diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 37a8e46c0..0cdb99629 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -25,7 +25,6 @@ declare -r _DEPS_SH=
declare -a DEPS_LIST=(
lcov
valgrind
- xqilla
)
if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
diff --git a/contrib/ci/misc.sh b/contrib/ci/misc.sh
index 9af848c76..642e43712 100644
--- a/contrib/ci/misc.sh
+++ b/contrib/ci/misc.sh
@@ -28,49 +28,6 @@ function rm_rf_ro()
rm -Rf -- "$@"
}
-# Run "scan-build" with output to a single specified directory, instead of
-# a subdirectory.
-# Args: dir [scan_build_arg...]
-function scan_build_single()
-{
- declare -r dir="$1"; shift
- declare entry
- declare subdir
- declare status
-
- set +o errexit
- scan-build -o "$dir" "$@"
- status="$?"
- set -o errexit
-
- for entry in "$dir/"*; do
- if [ -n "${subdir+set}" ] || ! [ -d "$entry" ]; then
- echo 'Unexpected entries in scan-build output directory' >&2
- exit 1
- fi
- subdir="$entry"
- done
-
- mv "$subdir/"* "$dir"
- rmdir "$subdir"
- return "$status"
-}
-
-# Check if a scan-build result directory has any non-empty .plist files.
-# Args: dir
-function scan_check()
-{
- declare -r dir="$1"
- declare f
- for f in "$dir"/*.plist; do
- if [ "`xqilla -i \"\$f\" /dev/stdin \
- <<<'count(/plist/dict/array[count(*) > 0])'`" != 0 ]; then
- return 1
- fi
- done
- return 0
-}
-
# Extract line and function coverage percentage from a "genhtml" or "lcov
# --summary" output.
# Input: "genhtml" or "lcov --summary" output
diff --git a/contrib/ci/run b/contrib/ci/run
index 00cf95094..2f81a002d 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -244,36 +244,25 @@ function build_debug()
# Run coverage build checks.
function build_coverage()
{
- declare -r scan_report_dir="ci-report-scan"
declare -r coverage_report_dir="ci-report-coverage"
declare test_dir
export CFLAGS="$COVERAGE_CFLAGS"
test_dir=`mktemp --directory /dev/shm/ci-test-dir.XXXXXXXX`
- stage configure scan-build "$BASE_DIR/configure" \
- "${CONFIGURE_ARG_LIST[@]}" \
- --with-test-dir="$test_dir"
+ stage configure "$BASE_DIR/configure" \
+ "${CONFIGURE_ARG_LIST[@]}" \
+ --with-test-dir="$test_dir"
# Build everything, including tests
# Not building "tests" due to https://fedorahosted.org/sssd/ticket/2350
- stage scan-make-tests scan_build_single \
- "$scan_report_dir" \
- -plist-html \
- --html-title="sssd - scan-build report" \
- make-check-wrap -j $CPU_NUM check -- true
- printf "%-$((TITLE_WIDTH + RESULT_WIDTH))s%s\n" \
- "scan report:" \
- "`disppath \"\$scan_report_dir/index.html\"`"
- # Ignored until issues found by the scanner are fixed
- stage scan-check scan_check "$scan_report_dir" ||
- true
+ stage make-tests make-check-wrap -j $CPU_NUM check -- true
stage lcov-pre lcov --capture --initial --directory . \
--base-directory "$BASE_DIR" \
--output-file ci-base.info
# Run tests
- stage make-check scan-build make -j $CPU_NUM check || true
+ stage make-check make -j $CPU_NUM check || true
mv "$test_dir" ci-test-dir
stage lcov-post lcov --capture --directory . \