From: Nicki Křížek Date: Wed, 1 Jul 2026 13:40:06 +0000 (+0000) Subject: Move libnghttp2 prereq.sh checks to a with_libnghttp2 marker X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ecacf92537c64a99d1bc3a212cc4ac9cb5f70817;p=thirdparty%2Fbind9.git Move libnghttp2 prereq.sh checks to a with_libnghttp2 marker Gates proxy, transport_change and the doth modules. doth also needs FIPS-DH, so its prereq.sh keeps that check for now. Assisted-by: Claude:claude-opus-4-8 --- diff --git a/bin/tests/system/doth/prereq.sh b/bin/tests/system/doth/prereq.sh index fe62dcb15ac..4dabc5b3e84 100644 --- a/bin/tests/system/doth/prereq.sh +++ b/bin/tests/system/doth/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -$FEATURETEST --with-libnghttp2 || { - echo_i "This test requires libnghttp2 support." >&2 - exit 255 -} - $FEATURETEST --have-fips-dh || { echo_i "FIPS mode Diffie-Hellman not working - skipping doth test" exit 255 diff --git a/bin/tests/system/doth/tests_gnutls.py b/bin/tests/system/doth/tests_gnutls.py index 7053311debd..81eb4980d4b 100644 --- a/bin/tests/system/doth/tests_gnutls.py +++ b/bin/tests/system/doth/tests_gnutls.py @@ -24,14 +24,20 @@ import dns.rdatatype import pytest import isctest +import isctest.mark -pytestmark = pytest.mark.extra_artifacts( +EXTRA_ARTIFACTS = pytest.mark.extra_artifacts( [ "gnutls-cli.*", "ns*/example*.db", ] ) +pytestmark = [ + isctest.mark.with_libnghttp2, + EXTRA_ARTIFACTS, +] + def test_gnutls_cli_query(gnutls_cli_executable, named_tlsport): # Prepare the example/SOA query which will be sent over TLS. diff --git a/bin/tests/system/doth/tests_malicious.py b/bin/tests/system/doth/tests_malicious.py index 7529f2b7e19..34b26b445ee 100644 --- a/bin/tests/system/doth/tests_malicious.py +++ b/bin/tests/system/doth/tests_malicious.py @@ -18,6 +18,12 @@ from h2.settings import SettingCodes import dns.message +import isctest.mark + +pytestmark = [ + isctest.mark.with_libnghttp2, +] + def test_settings_frame_flood(ns1, named_httpsport): msg = dns.message.make_query(".", "SOA") diff --git a/bin/tests/system/doth/tests_sh_doth.py b/bin/tests/system/doth/tests_sh_doth.py index 69e92fab4c1..28866395580 100644 --- a/bin/tests/system/doth/tests_sh_doth.py +++ b/bin/tests/system/doth/tests_sh_doth.py @@ -11,7 +11,9 @@ import pytest -pytestmark = pytest.mark.extra_artifacts( +import isctest.mark + +EXTRA_ARTIFACTS = pytest.mark.extra_artifacts( [ "dig.out.*", "headers.*", @@ -19,6 +21,11 @@ pytestmark = pytest.mark.extra_artifacts( ] ) +pytestmark = [ + isctest.mark.with_libnghttp2, + EXTRA_ARTIFACTS, +] + def test_doth(run_tests_sh): run_tests_sh() diff --git a/bin/tests/system/doth/tests_sslyze.py b/bin/tests/system/doth/tests_sslyze.py index 33d916abf2b..9ab801d9423 100644 --- a/bin/tests/system/doth/tests_sslyze.py +++ b/bin/tests/system/doth/tests_sslyze.py @@ -18,14 +18,20 @@ import subprocess import pytest import isctest +import isctest.mark -pytestmark = pytest.mark.extra_artifacts( +EXTRA_ARTIFACTS = pytest.mark.extra_artifacts( [ "sslyze.log.*", "ns*/example*.db", ] ) +pytestmark = [ + isctest.mark.with_libnghttp2, + EXTRA_ARTIFACTS, +] + def is_pid_alive(pid): try: diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py index fd9e2233701..09e27548de6 100644 --- a/bin/tests/system/isctest/mark.py +++ b/bin/tests/system/isctest/mark.py @@ -108,6 +108,11 @@ with_json_c = pytest.mark.skipif( os.getenv("FEATURE_JSON_C") != "1", reason="json-c support disabled in the build" ) +with_libnghttp2 = pytest.mark.skipif( + os.getenv("FEATURE_LIBNGHTTP2") != "1", + reason="libnghttp2 support disabled in the build", +) + softhsm2_environment = pytest.mark.skipif( not ( os.getenv("SOFTHSM2_CONF") diff --git a/bin/tests/system/proxy/prereq.sh b/bin/tests/system/proxy/prereq.sh deleted file mode 100644 index 225c1e2e7eb..00000000000 --- a/bin/tests/system/proxy/prereq.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -. ../conf.sh - -$FEATURETEST --with-libnghttp2 || { - echo_i "This test requires libnghttp2 support." >&2 - exit 255 -} - -exit 0 diff --git a/bin/tests/system/proxy/tests_sh_proxy.py b/bin/tests/system/proxy/tests_sh_proxy.py index 98239f282df..abe0ae3163a 100644 --- a/bin/tests/system/proxy/tests_sh_proxy.py +++ b/bin/tests/system/proxy/tests_sh_proxy.py @@ -11,13 +11,20 @@ import pytest -pytestmark = pytest.mark.extra_artifacts( +import isctest.mark + +EXTRA_ARTIFACTS = pytest.mark.extra_artifacts( [ "dig.out.*", "ns*/example.db", ] ) +pytestmark = [ + isctest.mark.with_libnghttp2, + EXTRA_ARTIFACTS, +] + def test_proxy(run_tests_sh): run_tests_sh() diff --git a/bin/tests/system/transport_change/prereq.sh b/bin/tests/system/transport_change/prereq.sh deleted file mode 100644 index 0c19f1178be..00000000000 --- a/bin/tests/system/transport_change/prereq.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -# shellcheck disable=SC1091 -. ../conf.sh - -$FEATURETEST --with-libnghttp2 || { - echo_i "This test requires libnghttp2 support." >&2 - exit 255 -} - -exit 0 diff --git a/bin/tests/system/transport_change/tests_sh_transport_change.py b/bin/tests/system/transport_change/tests_sh_transport_change.py index a4370b670ec..73fa34fdc02 100644 --- a/bin/tests/system/transport_change/tests_sh_transport_change.py +++ b/bin/tests/system/transport_change/tests_sh_transport_change.py @@ -11,13 +11,20 @@ import pytest -pytestmark = pytest.mark.extra_artifacts( +import isctest.mark + +EXTRA_ARTIFACTS = pytest.mark.extra_artifacts( [ "dig.out.*", "ns1/example.db", ] ) +pytestmark = [ + isctest.mark.with_libnghttp2, + EXTRA_ARTIFACTS, +] + def test_transport_change(run_tests_sh): run_tests_sh()