]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Add prereq.sh scripts for system tests requiring perl mod DNS
authorTom Krizek <tkrizek@isc.org>
Mon, 4 Sep 2023 11:56:28 +0000 (13:56 +0200)
committerTom Krizek <tkrizek@isc.org>
Wed, 20 Sep 2023 08:32:10 +0000 (10:32 +0200)
prereq.sh mechanism for dependency detection is preferred since it works
for both legacy and pytest runner.

(cherry picked from commit 9cc821d42f7dc1faf0f9777eaf1aee1cd9e9878b)

bin/tests/system/Makefile.am
bin/tests/system/fetchlimit/prereq.sh [new file with mode: 0644]
bin/tests/system/ixfr/prereq.sh [new file with mode: 0644]
bin/tests/system/nsupdate/prereq.sh [new file with mode: 0644]
bin/tests/system/resolver/prereq.sh [new file with mode: 0644]
bin/tests/system/statistics/prereq.sh [new file with mode: 0644]
bin/tests/system/stress/prereq.sh [new file with mode: 0644]
bin/tests/system/upforwd/prereq.sh [new file with mode: 0644]
bin/tests/system/zero/prereq.sh [new file with mode: 0644]

index 8f185728c37472887b3f0eb1891ae467ca718f1b..af5795f5fcfdc8d98cdfe1e40630cb879e012357 100644 (file)
@@ -126,6 +126,7 @@ TESTS +=                    \
        emptyzones              \
        enginepkcs11            \
        filter-aaaa             \
+       fetchlimit              \
        formerr                 \
        geoip2                  \
        glue                    \
@@ -133,6 +134,7 @@ TESTS +=                    \
        include-multiplecfg     \
        inline                  \
        integrity               \
+       ixfr                    \
        hooks                   \
        host                    \
        journal                 \
@@ -152,11 +154,13 @@ TESTS +=                  \
        notify                  \
        nsec3                   \
        nslookup                \
+       nsupdate                \
        nzd2nzf                 \
        padding                 \
        pending                 \
        pipelined               \
        redirect                \
+       resolver                \
        rndc                    \
        rootkeysentinel         \
        rpz                     \
@@ -172,6 +176,8 @@ TESTS +=                    \
        sortlist                \
        spf                     \
        staticstub              \
+       statistics              \
+       stress                  \
        stub                    \
        synthfromdnssec         \
        tcp                     \
@@ -183,24 +189,16 @@ TESTS +=                  \
        tsiggss                 \
        ttl                     \
        unknown                 \
+       upforwd                 \
        verify                  \
        views                   \
        wildcard                \
        xferquota               \
+       zero                    \
        zonechecks
 
 if HAVE_PERLMOD_NET_DNS
 
-TESTS +=               \
-       fetchlimit      \
-       ixfr            \
-       nsupdate        \
-       resolver        \
-       statistics      \
-       stress          \
-       upforwd         \
-       zero
-
 if HAVE_PERLMOD_FILE_FETCH
 TESTS += statschannel
 endif HAVE_PERLMOD_FILE_FETCH
diff --git a/bin/tests/system/fetchlimit/prereq.sh b/bin/tests/system/fetchlimit/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/statistics/prereq.sh b/bin/tests/system/statistics/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/stress/prereq.sh b/bin/tests/system/stress/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0
diff --git a/bin/tests/system/zero/prereq.sh b/bin/tests/system/zero/prereq.sh
new file mode 100644 (file)
index 0000000..0c29427
--- /dev/null
@@ -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 ! ${PERL} -MNet::DNS -e ''
+then
+       echo_i "perl Net::DNS module is required"
+       exit 1
+fi
+
+exit 0