From: Jo Zzsi Date: Sat, 10 Jan 2026 11:21:43 +0000 (-0500) Subject: ci: run TEST_CONTAINER_COMMAND before configure runs X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da549a33a563785b14efc5743709f50bc2e68ef2;p=thirdparty%2Fdracut-ng.git ci: run TEST_CONTAINER_COMMAND before configure runs Move running TEST_CONTAINER_COMMAND during CI tests earlier so that packages can be installed/uninstalled before configure runs. --- diff --git a/test/test-container.sh b/test/test-container.sh index a64723286..ced80b0d2 100755 --- a/test/test-container.sh +++ b/test/test-container.sh @@ -8,6 +8,9 @@ if command -v systemd-detect-virt > /dev/null && ! systemd-detect-virt -c &> /de exit 1 fi +# allow the execution of arbitrary commands within the test container +[[ -n ${TEST_CONTAINER_COMMAND-} ]] && eval "$TEST_CONTAINER_COMMAND" + set -eu if [ "${V-}" = "2" ]; then set -x; fi @@ -27,9 +30,6 @@ if [ "${V-}" = "2" ]; then set -x; fi # shellcheck disable=SC2086 ./configure --enable-test ${CONFIGURE_ARG-} -# allow the execution of arbitrary commands within the test container -[[ -n ${TEST_CONTAINER_COMMAND-} ]] && eval "$TEST_CONTAINER_COMMAND" - # treat warnings as error # shellcheck disable=SC2086 CFLAGS="-Wextra -Werror" make TEST_RUN_ID="${TEST_RUN_ID:=${1-}}" TESTS="${TESTS:=${2-}}" V="${V:=1}" ${MAKEFLAGS-} ${TARGETS:=all install check}