Remove -U 4 from system tests

This option doesn't appear to be needed for any of the tests, so remove
it to keep things simple.

diff --git a/bin/tests/system/README.md b/bin/tests/system/README.md
index 7bbf339a4f78ed13672466c74895af080dccc4df..1d4d4f7b66759c525fe089faea0bfa850013572c 100644 (file)
--- a/bin/tests/system/README.md
+++ b/bin/tests/system/README.md
@@ -325,8 +325,6 @@ By default, `named` server is started with the following options:
     -m record
                     Turns on these memory usage debugging flags.
 
-    -U 4            Uses four listeners.
-
 All output is sent to a file called `named.run` in the nameserver directory.
 
 The options used to start named can be altered. There are a couple ways of

diff --git a/bin/tests/system/dnstap/ns3/named.args b/bin/tests/system/dnstap/ns3/named.args
index d70946ad15824008ba964137b2ea072fc5e2dab1..47b682be67d3230571b18b3e82c99e1649919be7 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.args
+++ b/bin/tests/system/dnstap/ns3/named.args
@@ -1,2 +1,2 @@
 # Using "-n 1" allows GL #1795 to be reliably reproduced
--D dnstap-ns3 -m record -c named.conf -d 99 -g -U 4 -n 1 -T maxcachesize=2097152
+-D dnstap-ns3 -m record -c named.conf -d 99 -g -n 1 -T maxcachesize=2097152

diff --git a/bin/tests/system/enginepkcs11/ns1/named.args.in b/bin/tests/system/enginepkcs11/ns1/named.args.in
index 26d521e56c1aee86c9b6b1a40fbc68ce9cdd6c9a..889992190a3b38a0e4535f0be1a01bb545ca6e96 100644 (file)
--- a/bin/tests/system/enginepkcs11/ns1/named.args.in
+++ b/bin/tests/system/enginepkcs11/ns1/named.args.in
@@ -1 +1 @@
-@ENGINE_ARGS@ -D enginepkcs11-ns1 -m record -c named.conf -d 99 -U 4 -T maxcachesize=2097152
+@ENGINE_ARGS@ -D enginepkcs11-ns1 -m record -c named.conf -d 99 -T maxcachesize=2097152

diff --git a/bin/tests/system/legacy/ns4/named.args b/bin/tests/system/legacy/ns4/named.args
index dcd28aab4a91afa78ef03bfe7f389f82dc0c57c0..03dce0fafd6ce7562bc3574aababe6d4a2d43ab5 100644 (file)
--- a/bin/tests/system/legacy/ns4/named.args
+++ b/bin/tests/system/legacy/ns4/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns4 -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns4 -g -T maxcachesize=2097152 -T noedns

diff --git a/bin/tests/system/legacy/ns5/named.args b/bin/tests/system/legacy/ns5/named.args
index 1519a1898841beb2ef8c8349d096525418134877..e1311c8de8204ceca135bc757b6f4bac05f2e351 100644 (file)
--- a/bin/tests/system/legacy/ns5/named.args
+++ b/bin/tests/system/legacy/ns5/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns5 -g -U 4 -T maxcachesize=2097152 -T noedns
+-m record -c named.conf -d 99 -D legacy-ns5 -g -T maxcachesize=2097152 -T noedns

diff --git a/bin/tests/system/legacy/ns6/named.args b/bin/tests/system/legacy/ns6/named.args
index 0bad4d37b2227b022ecf55b8e9daa9d08666c9ff..1791e8b704ea1a2fe93aaa4e52411c9929585371 100644 (file)
--- a/bin/tests/system/legacy/ns6/named.args
+++ b/bin/tests/system/legacy/ns6/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns6 -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns6 -g -T maxcachesize=2097152 -T maxudp512

diff --git a/bin/tests/system/legacy/ns7/named.args b/bin/tests/system/legacy/ns7/named.args
index 7f2143951914393137dac0ed62906bd14d8a99a9..3c90ac1c81c0b0df967383fe030c52eb6927037c 100644 (file)
--- a/bin/tests/system/legacy/ns7/named.args
+++ b/bin/tests/system/legacy/ns7/named.args
@@ -1 +1 @@
--m record -c named.conf -d 99 -D legacy-ns7 -g -U 4 -T maxcachesize=2097152 -T maxudp512
+-m record -c named.conf -d 99 -D legacy-ns7 -g -T maxcachesize=2097152 -T maxudp512

diff --git a/bin/tests/system/logfileconfig/named1.args b/bin/tests/system/logfileconfig/named1.args
index a76bb73f646cd62a405a7ba22ace9c2a1f609ff7..37ed9763793a4a55d09671f644cdd477937d4355 100644 (file)
--- a/bin/tests/system/logfileconfig/named1.args
+++ b/bin/tests/system/logfileconfig/named1.args
@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1

diff --git a/bin/tests/system/logfileconfig/named2.args b/bin/tests/system/logfileconfig/named2.args
index 787e5c980ec1abb4acb34f7314f9bc245c6b0ba5..45347fc1b7c1fb366a7a50b663bd025b0738d242 100644 (file)
--- a/bin/tests/system/logfileconfig/named2.args
+++ b/bin/tests/system/logfileconfig/named2.args
@@ -1 +1 @@
--c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -U 4 -L named_deflog
+-c named.conf -m record -T nosyslog -d 99 -D logfileconfig-ns1 -L named_deflog

diff --git a/bin/tests/system/mirror/ns3/named.args b/bin/tests/system/mirror/ns3/named.args
index e28cf3a07618778fb3e0d72c4388c9cb74e372ef..e5ebb6cda419f87f36d833c3032aa3d805af367d 100644 (file)
--- a/bin/tests/system/mirror/ns3/named.args
+++ b/bin/tests/system/mirror/ns3/named.args
@@ -1 +1 @@
--D mirror-ns3 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T tat=3
+-D mirror-ns3 -m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T tat=3

diff --git a/bin/tests/system/nsupdate/ns5/named.args b/bin/tests/system/nsupdate/ns5/named.args
index a50eb556138648d13e89173732a6aca6c42f26ed..64da462fd55051ef08a04f0aa8e00b0640773409 100644 (file)
--- a/bin/tests/system/nsupdate/ns5/named.args
+++ b/bin/tests/system/nsupdate/ns5/named.args
@@ -1 +1 @@
--D nsupdate-ns5 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns5 -m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T fixedlocal

diff --git a/bin/tests/system/nsupdate/ns6/named.args b/bin/tests/system/nsupdate/ns6/named.args
index e7d800f5ae94c9f510c75b5146f37c69156e5968..e0a22250dd0c1de3eb474c0eb59090c93a4e0f1c 100644 (file)
--- a/bin/tests/system/nsupdate/ns6/named.args
+++ b/bin/tests/system/nsupdate/ns6/named.args
@@ -1 +1 @@
--D nsupdate-ns6 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T fixedlocal
+-D nsupdate-ns6 -m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T fixedlocal

diff --git a/bin/tests/system/rndc/ns6/named.args b/bin/tests/system/rndc/ns6/named.args
index 94bde0d35c3e0ffa39f768ec86621208eba499bf..82e87714e699c82793567937eabd3c12007c7478 100644 (file)
--- a/bin/tests/system/rndc/ns6/named.args
+++ b/bin/tests/system/rndc/ns6/named.args
@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long
 # -m none is set so that stop.pl does not timeout
--D rndc-ns6 -m none -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152
+-D rndc-ns6 -m none -c named.conf -d 99 -g -T maxcachesize=2097152

diff --git a/bin/tests/system/rpzextra/ns3/named.args b/bin/tests/system/rpzextra/ns3/named.args
index 227438d376f825210ee1b332ebeb55702820f7d6..7b5a9edf70deaf73cf8056bb0690c259e637d470 100644 (file)
--- a/bin/tests/system/rpzextra/ns3/named.args
+++ b/bin/tests/system/rpzextra/ns3/named.args
@@ -1 +1 @@
- -m record -c named.conf -d 99 -D rpzextra-ns1 -U 4 -T maxcachesize=2097152
+ -m record -c named.conf -d 99 -D rpzextra-ns1 -T maxcachesize=2097152

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index edddc08934ae9a95f2d5f7b16786cb4ebca4f7fa..0d2394683c57179637fc1fef37240ff155ffe29e 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -17,7 +17,7 @@ set -e
 . ../conf.sh
 
 RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
-NAMED_DEFAULT_ARGS="-m record -d 99 -g -U 4"
+NAMED_DEFAULT_ARGS="-m record -d 99 -g"
 
 kill_named() {
   pidfile="${1}"

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 66bb59afda6a4a420b55f9fe9581a69dc0068928..9253831782ea59aba412cc299ffd987f7bced229 100755 (executable)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -280,7 +280,7 @@ sub construct_ns_command {
                        }
                }
 
-               $command .= "-c named.conf -d 99 -g -U 4 -T maxcachesize=2097152";
+               $command .= "-c named.conf -d 99 -g -T maxcachesize=2097152";
        }
 
        if (-e "$testdir/$server/named.notcp") {

diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index fd0813b23d95f4a60c0c4a6dea8e9811d7fa102d..c871120e36186499671748c3badab13c75fac392 100644 (file)
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -18,7 +18,7 @@ set -e
 
 DIGCMD="$DIG @10.53.0.2 -p ${PORT}"
 RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
-NS_PARAMS="-m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
+NS_PARAMS="-m record -c named.conf -d 99 -g -T maxcachesize=2097152"
 
 if ! $FEATURETEST --have-json-c; then
   unset PERL_JSON

diff --git a/bin/tests/system/xfer/ns6/named.args b/bin/tests/system/xfer/ns6/named.args
index 7580d15297dfa59167bdf1a6dccc712a165947a6..96034b5641d9c76d5bf7aec461c012e4f06e7ba1 100644 (file)
--- a/bin/tests/system/xfer/ns6/named.args
+++ b/bin/tests/system/xfer/ns6/named.args
@@ -1 +1 @@
--D xfer-ns6 -m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152 -T transferinsecs
+-D xfer-ns6 -m record -c named.conf -d 99 -g -T maxcachesize=2097152 -T transferinsecs

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 01427a2a4d48ec641fcc694842183e119aa49330..76b51dfd6bec02bdde5acbcfc2bab1b788909a41 100755 (executable)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -17,7 +17,7 @@ set -e
 
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
 RNDCCMD="$RNDC -c ../_common/rndc.conf -p ${CONTROLPORT} -s"
-NS_PARAMS="-m record -c named.conf -d 99 -g -U 4 -T maxcachesize=2097152"
+NS_PARAMS="-m record -c named.conf -d 99 -g -T maxcachesize=2097152"
 
 status=0
 n=0