[rt46602] Allow catz system test to run in parallel with other tests

bin/tests/system/Makefile.in

@@ -47,7 +47,7 @@ feature-test@EXEEXT@: feature-test.@O@
 # the definition of PARALLELDIRS in conf.sh.  These tests do not use query
 # port 5300 or control port 9953.
 
-PARALLEL = allow_query serve-stale rpzrecurse
+PARALLEL = allow_query catz serve-stale rpzrecurse
 
 # Produce intermediate makefile that assigns unique port numbers to each
 # parallel test.

bin/tests/system/catz/clean.sh

@@ -4,15 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+rm -f test.output
 rm -f dig.out.*
 rm -f ns*/*.jnl
 rm -f ns*/*.nzf
 rm -f ns*/named.lock
 rm -f ns*/named.memstats
+rm -f ns*/named.conf
 rm -f ns*/named.run
+rm -f ns*/named.port
 rm -f ns1/*dom*example.db
 rm -f ns2/__catz__*db
-rm -f ns2/named.conf
+rm -f ns2/named.conf.tmp
 rm -f ns3/dom{13,14}.example.db
 rm -f nsupdate.out.*
 rm -f ns{1,2,3}/catalog{1,2,3,4}.example.db

bin/tests/system/catz/ns1/named.conf.in

@@ -9,18 +9,18 @@
 include "../../common/rndc.key";
 
 controls {
-	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
 	query-source address 10.53.0.1;
 	notify-source 10.53.0.1;
 	transfer-source 10.53.0.1;
-	port 5300;
+	port @PORT@;
 	allow-new-zones yes;
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
-	listen-on port 5301 { 10.53.0.1; };
+	listen-on port @APORT1@ { 10.53.0.1; };
 	listen-on-v6 { none; };
 	notify no;
 	recursion no;

bin/tests/system/catz/ns2/named.conf.in

@@ -9,14 +9,14 @@
 include "../../common/rndc.key";
 
 controls {
-	inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
 	query-source address 10.53.0.2;
 	notify-source 10.53.0.2;
 	transfer-source 10.53.0.2;
-	port 5300;
+	port @PORT@;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { fd92:7065:b8e:ffff::2; };
@@ -29,7 +29,7 @@ options {
 			in-memory no
 			zone-directory "zonedir";
 		zone "catalog2.example"
-			default-masters { 10.53.0.1 port 5301; }
+			default-masters { 10.53.0.1 port @APORT1@; }
 			in-memory yes;
 		zone "catalog3.example"
 			default-masters { 10.53.0.1; }

bin/tests/system/catz/ns3/named.conf.in

@@ -9,14 +9,14 @@
 include "../../common/rndc.key";
 
 controls {
-	inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
 	query-source address 10.53.0.3;
 	notify-source 10.53.0.3;
 	transfer-source 10.53.0.3;
-	port 5300;
+	port @PORT@;
 	allow-new-zones yes;
 	pid-file "named.pid";
 	provide-ixfr no;

bin/tests/system/catz/setup.sh

@@ -8,12 +8,19 @@
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
+. $SYSTEMTESTTOP/getopts.sh
 
-$SHELL clean.sh
+copy_setports ns1/named.conf.in ns1/named.conf
+copy_setports ns2/named.conf.in ns2/named.conf
+copy_setports ns3/named.conf.in ns3/named.conf
 
-cat ns1/catalog.example.db.in > ns1/catalog1.example.db
-cat ns1/catalog.example.db.in > ns3/catalog2.example.db
-cat ns1/catalog.example.db.in > ns1/catalog3.example.db
-cat ns1/catalog.example.db.in > ns1/catalog4.example.db
-cat ns2/named.conf.in > ns2/named.conf
-mkdir ns2/zonedir
+cp -f ns1/catalog.example.db.in ns1/catalog1.example.db
+cp -f ns1/catalog.example.db.in ns3/catalog2.example.db
+cp -f ns1/catalog.example.db.in ns1/catalog3.example.db
+cp -f ns1/catalog.example.db.in ns1/catalog4.example.db
+
+mkdir -p ns2/zonedir
+
+echo "${port}" > ns1/named.port
+echo "${port}" > ns2/named.port
+echo "${port}" > ns3/named.port

bin/tests/system/conf.sh.in

@@ -76,7 +76,7 @@ KRB5_CONFIG=/dev/null
 # List of tests that use ports 5300 and 9953.  For this reason, these must
 # be run sequentially.
 SEQUENTIALDIRS="acl additional addzone autosign builtin
-	 cacheclean case catz cds chain
+	 cacheclean case cds chain
          checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@
          database digdelv dlv dlz dlzexternal
 	 dns64 dnssec @DNSTAP@ dscp dsdigest dyndb ecdsa eddsa
@@ -95,7 +95,7 @@ SEQUENTIALDIRS="acl additional addzone autosign builtin
 # tests can be run in parallel.
 #
 # This symbol must be kept in step with the PARALLEL macro in Makefile.in
-PARALLELDIRS="allow_query rps-recurse serve-stale"
+PARALLELDIRS="allow_query catz rpzrecurse serve-stale"
 
 SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"