On 09/03/2014 06:08 PM, Michal Židek wrote:
On 09/03/2014 05:03 PM, Nikolai Kondrashov wrote:
This patch fixes incorrect assumption of cmocka missing from RHEL6 by CI
and correspondingly enables coverage percentage check there.
It requires "CI: Allow disabling distro-(in)dependent tests" as it is, but
can be rebased, if necessary.
Please rebase the patch on top of current master.
Sure, here it is.
Verified with a RHEL6-only job to save time:
http://sssd-ci.duckdns.org/logs/job/0/36/summary.html
Nick
>From 6ac23470e58b3959a114b9e21244b40d8ad02c03 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <nikolai.kondras...@redhat.com>
Date: Wed, 3 Sep 2014 16:41:51 +0300
Subject: [PATCH 1/1] CI: Consider libcmocka-devel always present
Add explicit dependency on libcmocka-devel when running on any Red Hat
distros, as it turns out it exists everywhere, if only in EPEL distros,
and even though the spec file doesn't require it.
This makes the contrib/ci/run consider cmocka present on all the
supported distros, so remove the corresponding condition as well.
---
contrib/ci/deps.sh | 8 +-------
contrib/ci/run | 10 +++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 0cd1661..41acbc2 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -28,13 +28,11 @@ declare -a DEPS_LIST=(
xqilla
)
-# True, if all test dependencies are satisfied by the package list
-declare DEPS_TESTS_SATISFIED=true
-
if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
declare _DEPS_LIST_SPEC
DEPS_LIST+=(
clang-analyzer
+ libcmocka-devel
mock
rpm-build
)
@@ -44,9 +42,6 @@ if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
-e 's/@PRERELEASE_VERSION@//g' contrib/sssd.spec.in |
rpm-spec-builddeps /dev/stdin`
readarray -t -O "${#DEPS_LIST[@]}" DEPS_LIST <<<"$_DEPS_LIST_SPEC"
- if [[ "$DISTRO_BRANCH" == *-redhatenterprise*-6.*- ]]; then
- DEPS_TESTS_SATISFIED=false
- fi
fi
if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
@@ -103,7 +98,6 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
fi
declare -a -r DEPS_LIST
-declare -r DEPS_TESTS_SATISFIED
# Install dependencies.
function deps_install()
diff --git a/contrib/ci/run b/contrib/ci/run
index b8a296a..c62b637 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -289,13 +289,9 @@ function build_coverage()
"coverage report:" \
"`disppath \"\$coverage_report_dir/index.html\"`"
- # If dependencies for all tests are satisfied
- # and so all the tests should have been built and ran.
- if "$DEPS_TESTS_SATISFIED"; then
- stage lcov-check eval 'lcov_check "$COVERAGE_MIN_LINES" \
- "$COVERAGE_MIN_FUNCS" \
- < ci-genhtml.out'
- fi
+ stage lcov-check eval 'lcov_check "$COVERAGE_MIN_LINES" \
+ "$COVERAGE_MIN_FUNCS" \
+ < ci-genhtml.out'
unset CFLAGS
}
--
2.1.0
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
