From: Nicki Křížek Date: Thu, 27 Nov 2025 13:13:32 +0000 (+0100) Subject: Remove obsolete dnspython prerequisite checks X-Git-Tag: v9.21.16~16^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1ffc80f26cd22af2002e524d2f10c2a7d40f0ee;p=thirdparty%2Fbind9.git Remove obsolete dnspython prerequisite checks dnspython has been mandatory to run system test for quite a while. Remove all extraneous checks for this module from prereq.sh scipts. --- diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh index fe84055246e..0d6e2b45d41 100644 --- a/bin/tests/system/chain/prereq.sh +++ b/bin/tests/system/chain/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/cookie/prereq.sh b/bin/tests/system/cookie/prereq.sh deleted file mode 100644 index b6b005f8ff4..00000000000 --- a/bin/tests/system/cookie/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 - -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - -exit 0 diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh index 32889aa2518..c52be9c97a9 100644 --- a/bin/tests/system/digdelv/prereq.sh +++ b/bin/tests/system/digdelv/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh index 32889aa2518..c52be9c97a9 100644 --- a/bin/tests/system/dnssec/prereq.sh +++ b/bin/tests/system/dnssec/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/forward/prereq.sh b/bin/tests/system/forward/prereq.sh index 32889aa2518..c52be9c97a9 100644 --- a/bin/tests/system/forward/prereq.sh +++ b/bin/tests/system/forward/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/qmin/prereq.sh b/bin/tests/system/qmin/prereq.sh deleted file mode 100644 index b6b005f8ff4..00000000000 --- a/bin/tests/system/qmin/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 - -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - -exit 0