From 74def754f9d507ca45f86b673fe347642a4a79ec Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 4 Sep 2023 15:38:25 +0200 Subject: [PATCH] Use prereq.sh for digdelv, dnssec, forward system tests (cherry picked from commit 00b92bd06465134b8108c2c947cc8226f5a15205) --- bin/tests/system/Makefile.am | 4 +++- bin/tests/system/digdelv/prereq.sh | 28 ++++++++++++++++++++++++++++ bin/tests/system/dnssec/prereq.sh | 28 ++++++++++++++++++++++++++++ bin/tests/system/forward/prereq.sh | 28 ++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 bin/tests/system/digdelv/prereq.sh create mode 100644 bin/tests/system/dnssec/prereq.sh create mode 100644 bin/tests/system/forward/prereq.sh diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index dca4dd205a..03dc17b32e 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -113,9 +113,11 @@ TESTS += \ cookie \ database \ dialup \ + digdelv \ dispatch \ dlzexternal \ dns64 \ + dnssec \ dnstap \ doth \ dsdigest \ @@ -129,6 +131,7 @@ TESTS += \ filter-aaaa \ fetchlimit \ formerr \ + forward \ geoip2 \ glue \ idna \ @@ -204,7 +207,6 @@ TESTS += \ if HAVE_PYMOD_DNS if HAVE_PERLMOD_NET_DNS -TESTS += digdelv dnssec forward if HAVE_PERLMOD_NET_DNS_NAMESERVER TESTS += chain endif HAVE_PERLMOD_NET_DNS_NAMESERVER diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh new file mode 100644 index 0000000000..213178ada2 --- /dev/null +++ b/bin/tests/system/digdelv/prereq.sh @@ -0,0 +1,28 @@ +#!/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 + +if ! ${PERL} -MNet::DNS -e '' +then + echo_i "perl Net::DNS module is required" + exit 1 +fi + +exit 0 diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh new file mode 100644 index 0000000000..213178ada2 --- /dev/null +++ b/bin/tests/system/dnssec/prereq.sh @@ -0,0 +1,28 @@ +#!/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 + +if ! ${PERL} -MNet::DNS -e '' +then + echo_i "perl Net::DNS module is required" + exit 1 +fi + +exit 0 diff --git a/bin/tests/system/forward/prereq.sh b/bin/tests/system/forward/prereq.sh new file mode 100644 index 0000000000..213178ada2 --- /dev/null +++ b/bin/tests/system/forward/prereq.sh @@ -0,0 +1,28 @@ +#!/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 + +if ! ${PERL} -MNet::DNS -e '' +then + echo_i "perl Net::DNS module is required" + exit 1 +fi + +exit 0