From 53a09edc4fa885c335c835cc4b7bf5e0d8cd1fce Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Mon, 4 Sep 2023 15:34:05 +0200 Subject: [PATCH] Use prereq.sh for qmin, cookie system tests (cherry picked from commit 78981cee775f38c23cef7ce49ba680e09527ecee) --- bin/tests/system/Makefile.am | 3 ++- bin/tests/system/cookie/.gitignore | 1 - bin/tests/system/cookie/prereq.sh | 22 ++++++++++++++++++++++ bin/tests/system/qmin/prereq.sh | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) delete mode 100644 bin/tests/system/cookie/.gitignore create mode 100644 bin/tests/system/cookie/prereq.sh create mode 100644 bin/tests/system/qmin/prereq.sh diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index 64f3851499..dca4dd205a 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -110,6 +110,7 @@ TESTS += \ checkds \ checknames \ checkzone \ + cookie \ database \ dialup \ dispatch \ @@ -159,6 +160,7 @@ TESTS += \ padding \ pending \ pipelined \ + qmin \ reclimit \ redirect \ resolver \ @@ -201,7 +203,6 @@ TESTS += \ zonechecks if HAVE_PYMOD_DNS -TESTS += qmin cookie if HAVE_PERLMOD_NET_DNS TESTS += digdelv dnssec forward if HAVE_PERLMOD_NET_DNS_NAMESERVER diff --git a/bin/tests/system/cookie/.gitignore b/bin/tests/system/cookie/.gitignore deleted file mode 100644 index eee491d3c6..0000000000 --- a/bin/tests/system/cookie/.gitignore +++ /dev/null @@ -1 +0,0 @@ -prereq.sh diff --git a/bin/tests/system/cookie/prereq.sh b/bin/tests/system/cookie/prereq.sh new file mode 100644 index 0000000000..a48d383456 --- /dev/null +++ b/bin/tests/system/cookie/prereq.sh @@ -0,0 +1,22 @@ +#!/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/qmin/prereq.sh b/bin/tests/system/qmin/prereq.sh new file mode 100644 index 0000000000..a48d383456 --- /dev/null +++ b/bin/tests/system/qmin/prereq.sh @@ -0,0 +1,22 @@ +#!/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