upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 07:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use prereq.sh for chain system test

Browse source
This commit is contained in:
Tom Krizek 2023-09-04 16:05:10 +02:00
parent 00b92bd064
commit 5d9a09c086
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7
3 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/tests/system/Makefile.am
View file

@ -93,6 +93,7 @@ TESTS += \
case \
catz \
cds \
chain \
checkconf \
checkds \
checknames \
@ -190,14 +191,6 @@ TESTS += \
zero \
zonechecks
if HAVE_PYMOD_DNS
if HAVE_PERLMOD_NET_DNS
if HAVE_PERLMOD_NET_DNS_NAMESERVER
TESTS += chain
endif HAVE_PERLMOD_NET_DNS_NAMESERVER
endif HAVE_PERLMOD_NET_DNS
endif HAVE_PYMOD_DNS
else !HAVE_PYTEST
check:
echo pytest is not available, no tests were ran

34
bin/tests/system/chain/prereq.sh Normal file
View file

@ -0,0 +1,34 @@
#!/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
if ! ${PERL} -MNet::DNS::Nameserver -e ''
then
echo_i "perl Net::DNS::Nameserver module is required"
exit 1
fi
exit 0

7
configure.ac
View file

@ -315,10 +315,6 @@ AX_PERL_MODULE([Net::DNS])
AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS],
[test "$HAVE_PERLMOD_NET__DNS" = "yes"])
AX_PERL_MODULE([Net::DNS::Nameserver])
AM_CONDITIONAL([HAVE_PERLMOD_NET_DNS_NAMESERVER],
[test "$HAVE_PERLMOD_NET__DNS__NAMESERVER" = "yes"])
AX_PERL_MODULE([Time::HiRes])
AM_CONDITIONAL([HAVE_PERLMOD_TIME_HIRES],
[test "$HAVE_PERLMOD_TIME__HIRES" = "yes"])
@ -335,9 +331,6 @@ AS_IF([test -z "$PYTEST"],
AC_SUBST([PYTEST])
AM_CONDITIONAL([HAVE_PYTEST], [test -n "$PYTEST"])
AX_PYTHON_MODULE([dns])
AM_CONDITIONAL([HAVE_PYMOD_DNS], [test "$HAVE_PYMOD_DNS" = "yes"])
#
# xsltproc is optional, it is used only by system test scripts.
#