summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/ci/deps.sh8
-rwxr-xr-xcontrib/ci/run10
2 files changed, 4 insertions, 14 deletions
diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 0cd16618c..41acbc27b 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 b8a296aea..c62b63799 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
}