From: Yu Watanabe Date: Wed, 12 Feb 2025 10:56:25 +0000 (+0900) Subject: TEST-75-RESOLVED: assume knot 3.0 or newer is installed X-Git-Tag: v258-rc1~1338^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39da9b894f1289fd4f1961ae7318f60be3e39040;p=thirdparty%2Fsystemd.git TEST-75-RESOLVED: assume knot 3.0 or newer is installed And make the test failed if knot is installed but older than 3.0. --- diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh index d7b535f1538..dc87b1192de 100755 --- a/test/units/TEST-75-RESOLVED.sh +++ b/test/units/TEST-75-RESOLVED.sh @@ -16,12 +16,14 @@ set -o pipefail # shellcheck source=test/units/util.sh . "$(dirname "$0")"/util.sh -# We need at least Knot 3.0 which support (among others) the ds-push directive -if ! knotc -c /usr/lib/systemd/tests/testdata/knot-data/knot.conf conf-check; then - echo "This test requires at least Knot 3.0. skipping..." | tee --append /skipped +if ! command knotc >/dev/null; then + echo "command knotc not found, skipping..." | tee --append /skipped exit 77 fi +# We need at least Knot 3.0 which support (among others) the ds-push directive +knotc -c /usr/lib/systemd/tests/testdata/knot-data/knot.conf conf-check + RUN_OUT="$(mktemp)" run() {