diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ci/configure.sh | 1 | ||||
| -rw-r--r-- | contrib/ci/deps.sh | 11 | ||||
| -rwxr-xr-x | contrib/ci/run | 9 |
3 files changed, 20 insertions, 1 deletions
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index d5d4c791a..d68f33191 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -44,6 +44,7 @@ if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*- ]]; then "--without-python3-bindings" ) fi + declare -r -a CONFIGURE_ARG_LIST fi # _CONFIGURE_SH diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh index 4e0ce1e03..8f872037c 100644 --- a/contrib/ci/deps.sh +++ b/contrib/ci/deps.sh @@ -27,15 +27,23 @@ declare -a DEPS_LIST=( valgrind ) +# "Integration tests dependencies satisfied" flag +declare DEPS_INTGCHECK_SATISFIED=true + if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then declare _DEPS_LIST_SPEC DEPS_LIST+=( clang-analyzer + fakeroot libcmocka-devel mock + nss_wrapper + openldap-clients + openldap-servers + pytest + python-ldap rpm-build uid_wrapper - nss_wrapper ) _DEPS_LIST_SPEC=` sed -e 's/@PACKAGE_VERSION@/0/g' \ @@ -98,6 +106,7 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then xml-core xsltproc ) + DEPS_INTGCHECK_SATISFIED=false fi declare -a -r DEPS_LIST diff --git a/contrib/ci/run b/contrib/ci/run index 2f81a002d..5f668ff7d 100755 --- a/contrib/ci/run +++ b/contrib/ci/run @@ -188,6 +188,7 @@ function build_debug() export CFLAGS="$DEBUG_CFLAGS" declare test_dir declare test_dir_distcheck + declare intgcheck_configure_args declare distcheck_configure_args declare status @@ -217,6 +218,14 @@ function build_debug() ((status == 0)) if "$MODERATE"; then + if "$DEPS_INTGCHECK_SATISFIED"; then + printf -v intgcheck_configure_args " %q" \ + "${CONFIGURE_ARG_LIST[@]}" + stage make-intgcheck make -j $CPU_NUM intgcheck \ + INTGCHECK_CONFIGURE_FLAGS=" \ + $intgcheck_configure_args" + fi + test_dir_distcheck=`mktemp --directory /dev/shm/ci-test-dir.XXXXXXXX` # Single thread due to https://fedorahosted.org/sssd/ticket/2354 status=0 |