From 905057ba00ca9da57003f851d5d144473bb97bde Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Tue, 14 Jan 2014 23:38:55 +0100 Subject: [PATCH] reorganize regression tests --- .travis.yml | 2 +- modules/tinydnsbackend/generate-data.sh | 8 +- .../edns-packet-cache/named.conf | 2 +- .../tinydns-data-check/command | 4 +- .../tinydns-data-check/expected_result | 22 +- regression-tests/.gitignore | 13 - regression-tests/backends/bind-master | 61 + regression-tests/backends/bind-slave | 35 + regression-tests/backends/common | 108 ++ regression-tests/backends/gmysql-master | 112 ++ regression-tests/backends/gmysql-slave | 67 + regression-tests/backends/goracle-master | 66 + regression-tests/backends/goracle-slave | 66 + regression-tests/backends/gpgsql-master | 88 ++ regression-tests/backends/gsqlite3-master | 71 + regression-tests/backends/gsqlite3-slave | 54 + regression-tests/backends/mydns-master | 38 + regression-tests/backends/opendbx-master | 21 + regression-tests/backends/oracle-master | 68 + regression-tests/backends/remote-master | 121 ++ regression-tests/backends/tinydns-master | 14 + regression-tests/ext/bind-master | 120 ++ regression-tests/ext/bind-slave | 39 + regression-tests/ext/nsd-master | 123 ++ regression-tests/ext/nsd-slave | 47 + regression-tests/named.conf | 24 +- regression-tests/start-test-stop | 1193 +---------------- regression-tests/tests/.gitignore | 5 + .../{ => tests}/00dnssec-grabkeys/command | 2 +- .../{ => tests}/00dnssec-grabkeys/description | 0 .../00dnssec-grabkeys/expected_result | 0 .../{ => tests}/0dyndns-prereq-all/command | 0 .../0dyndns-prereq-all/description | 0 .../0dyndns-prereq-all/expected_result | 0 .../0dyndns-prereq-all/skip.nodyndns | 0 .../0dyndns-prereq-nxrrset-full/command | 0 .../0dyndns-prereq-nxrrset-full/description | 0 .../expected_result | 0 .../0dyndns-prereq-nxrrset-full/skip.nodyndns | 0 .../{ => tests}/1dyndns-big-package/command | 0 .../1dyndns-big-package/description | 0 .../1dyndns-big-package/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../1dyndns-big-package/expected_result.nsec3 | 0 .../1dyndns-big-package/skip.nodyndns | 0 .../1dyndns-check-soa-update/command | 0 .../1dyndns-check-soa-update/description | 0 .../1dyndns-check-soa-update/expected_result | 0 .../1dyndns-check-soa-update/skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-add-delete-cname/command | 0 .../description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-add-delete-ds/command | 0 .../1dyndns-update-add-delete-ds/description | 0 .../expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../skip.nodyndns | 0 .../1dyndns-update-add-delete-mx/command | 0 .../1dyndns-update-add-delete-mx/description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-add-delete/command | 0 .../1dyndns-update-add-delete/description | 0 .../1dyndns-update-add-delete/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../1dyndns-update-add-delete/skip.nodyndns | 0 .../1dyndns-update-add-invalid-record/command | 2 +- .../description | 0 .../expected_result | 0 .../sendupdate.pl | 0 .../skip.nodyndns | 0 .../1dyndns-update-add-soa/command | 0 .../1dyndns-update-add-soa/description | 0 .../1dyndns-update-add-soa/expected_result | 0 .../1dyndns-update-add-soa/skip.nodyndns | 0 .../1dyndns-update-deep-add-delete/command | 0 .../description | 0 .../expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../skip.nodyndns | 0 .../1dyndns-update-deep-delegate/command | 0 .../1dyndns-update-deep-delegate/description | 0 .../expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../skip-unboundhost | 0 .../skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../skip.nodyndns | 0 .../1dyndns-update-delegate/command | 0 .../1dyndns-update-delegate/description | 0 .../1dyndns-update-delegate/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../1dyndns-update-delegate/skip-unboundhost | 0 .../1dyndns-update-delegate/skip.nodyndns | 0 .../1dyndns-update-delete-add-host/command | 0 .../description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-delete-mx-prio/command | 0 .../1dyndns-update-delete-mx-prio/description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-delete-ns/command | 0 .../1dyndns-update-delete-ns/description | 0 .../1dyndns-update-delete-ns/expected_result | 0 .../1dyndns-update-delete-ns/skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../skip.nodyndns | 0 .../1dyndns-update-delete-soa/command | 0 .../1dyndns-update-delete-soa/description | 0 .../1dyndns-update-delete-soa/expected_result | 0 .../1dyndns-update-delete-soa/skip.nodyndns | 0 .../1dyndns-update-in-between/command | 0 .../1dyndns-update-in-between/description | 0 .../1dyndns-update-in-between/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../1dyndns-update-in-between/skip.nodyndns | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../expected_result.nsec3 | 0 .../skip.narrow | 0 .../skip.nodnssec | 0 .../skip.nodyndns | 0 .../1dyndns-update-nsec3params/command | 0 .../1dyndns-update-nsec3params/description | 0 .../expected_result | 0 .../expected_result.nsec3 | 0 .../1dyndns-update-nsec3params/skip.narrow | 0 .../1dyndns-update-nsec3params/skip.nodnssec | 0 .../1dyndns-update-nsec3params/skip.nodyndns | 0 .../1dyndns-update-replace-a-host/command | 0 .../1dyndns-update-replace-a-host/description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-replace-cname/command | 0 .../1dyndns-update-replace-cname/description | 0 .../expected_result | 0 .../skip.nodyndns | 0 .../1dyndns-update-replace-mx/command | 0 .../1dyndns-update-replace-mx/description | 0 .../1dyndns-update-replace-mx/expected_result | 0 .../1dyndns-update-replace-mx/skip.nodyndns | 0 .../{ => tests}/1dyndns-update-srv/command | 0 .../1dyndns-update-srv/description | 0 .../1dyndns-update-srv/expected_result | 0 .../1dyndns-update-srv/skip.nodyndns | 0 .../1dyndns-update-update-ttl/command | 0 .../1dyndns-update-update-ttl/description | 0 .../1dyndns-update-update-ttl/expected_result | 0 .../1dyndns-update-update-ttl/skip.nodyndns | 0 .../2dyndns-update-replace-soa/command | 0 .../2dyndns-update-replace-soa/description | 0 .../expected_result | 0 .../2dyndns-update-replace-soa/skip.nodyndns | 0 .../{ => tests}/5dyndns-restore-zone/command | 0 .../5dyndns-restore-zone/description | 0 .../5dyndns-restore-zone/expected_result | 0 .../5dyndns-restore-zone/skip.nodyndns | 0 .../{ => tests}/8bit-txt-unescaped/command | 0 .../8bit-txt-unescaped/description | 0 .../8bit-txt-unescaped/expected_result | 0 regression-tests/{ => tests}/8bit-txt/command | 0 .../{ => tests}/8bit-txt/description | 0 .../{ => tests}/8bit-txt/expected_result | 0 .../{ => tests}/any-nxdomain/command | 0 .../{ => tests}/any-nxdomain/description | 0 .../{ => tests}/any-nxdomain/expected_result | 0 .../any-nxdomain/expected_result.dnssec | 0 .../any-nxdomain/expected_result.narrow | 0 .../any-nxdomain/expected_result.nsec3 | 0 .../{ => tests}/any-query/command | 0 .../{ => tests}/any-query/description | 0 .../{ => tests}/any-query/expected_result | 0 .../{ => tests}/any-wildcard-dnssec/command | 0 .../any-wildcard-dnssec/description | 0 .../any-wildcard-dnssec/expected_result | 0 .../expected_result.narrow | 0 .../any-wildcard-dnssec/expected_result.nsec3 | 0 .../any-wildcard-dnssec/skip.nodnssec | 0 .../{ => tests}/any-wildcard/command | 0 .../{ => tests}/any-wildcard/description | 0 .../{ => tests}/any-wildcard/expected_result | 0 .../{ => tests}/apex-level-a-but-no-a/command | 0 .../apex-level-a-but-no-a/description | 0 .../apex-level-a-but-no-a/expected_result | 0 .../{ => tests}/apex-level-a/command | 0 .../{ => tests}/apex-level-a/description | 0 .../{ => tests}/apex-level-a/expected_result | 0 .../{ => tests}/apex-level-ns/command | 0 .../{ => tests}/apex-level-ns/description | 0 .../{ => tests}/apex-level-ns/expected_result | 0 .../{ => tests}/basic-a-resolution/command | 0 .../basic-a-resolution/description | 0 .../basic-a-resolution/expected_result | 0 .../{ => tests}/basic-aaaa-resolution/command | 0 .../basic-aaaa-resolution/description | 0 .../basic-aaaa-resolution/expected_result | 0 .../{ => tests}/basic-eui48/command | 0 .../{ => tests}/basic-eui48/description | 0 .../{ => tests}/basic-eui48/expected_result | 0 .../{ => tests}/basic-eui48/skip.bind | 0 .../{ => tests}/basic-eui48/skip.mydns | 0 .../{ => tests}/basic-eui48/skip.nsd | 0 .../{ => tests}/basic-eui64/command | 0 .../{ => tests}/basic-eui64/description | 0 .../{ => tests}/basic-eui64/expected_result | 0 .../{ => tests}/basic-eui64/skip.bind | 0 .../{ => tests}/basic-eui64/skip.mydns | 0 .../{ => tests}/basic-eui64/skip.nsd | 0 .../{ => tests}/basic-hinfo/command | 0 .../{ => tests}/basic-hinfo/description | 0 .../{ => tests}/basic-hinfo/expected_result | 0 .../{ => tests}/basic-loc/command | 0 .../{ => tests}/basic-loc/description | 0 .../{ => tests}/basic-loc/expected_result | 0 .../{ => tests}/basic-loc/skip.mydns | 0 .../{ => tests}/basic-nonzone/command | 0 .../{ => tests}/basic-nonzone/description | 0 .../{ => tests}/basic-nonzone/expected_result | 0 .../basic-nonzone/skip-unboundhost | 0 .../{ => tests}/basic-ns-resolution/command | 0 .../basic-ns-resolution/description | 0 .../basic-ns-resolution/expected_result | 0 .../{ => tests}/basic-soa-resolution/command | 0 .../basic-soa-resolution/description | 0 .../basic-soa-resolution/expected_result | 0 .../{ => tests}/basic-srv/command | 0 .../{ => tests}/basic-srv/description | 0 .../{ => tests}/basic-srv/expected_result | 0 .../{ => tests}/basic-txt-resolution/command | 0 .../basic-txt-resolution/description | 0 .../basic-txt-resolution/expected_result | 0 regression-tests/{ => tests}/big-axfr/command | 0 .../{ => tests}/big-axfr/description | 0 .../{ => tests}/big-axfr/expected_result | 0 .../{ => tests}/bind-add-zone/command | 4 +- .../{ => tests}/bind-add-zone/description | 0 .../{ => tests}/bind-add-zone/expected_result | 0 .../bind-add-zone/expected_result.bind | 2 +- .../{ => tests}/bind-add-zone/skip.presigned | 0 .../{ => tests}/bind-add-zone/stress/README | 0 .../bind-add-zone/stress/addzones.sh | 0 .../bind-add-zone/stress/createzones.sh | 0 .../bind-add-zone/stress/dnsperf.sh | 0 .../{ => tests}/bind-add-zone/stress/run.sh | 0 .../cname-and-wildcard-at-root/command | 0 .../cname-and-wildcard-at-root/description | 0 .../expected_result | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../{ => tests}/cname-and-wildcard/command | 0 .../cname-and-wildcard/description | 0 .../cname-and-wildcard/expected_result | 0 .../cname-but-no-correct-type/command | 0 .../cname-but-no-correct-type/description | 0 .../cname-but-no-correct-type/expected_result | 0 .../{ => tests}/cname-loop-breakout/command | 0 .../cname-loop-breakout/description | 0 .../cname-loop-breakout/expected_result | 0 .../cname-loop-breakout/skip-unboundhost | 0 .../{ => tests}/cname-to-nxdomain-any/command | 0 .../cname-to-nxdomain-any/description | 0 .../cname-to-nxdomain-any/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../{ => tests}/cname-to-nxdomain/command | 0 .../{ => tests}/cname-to-nxdomain/description | 0 .../cname-to-nxdomain/expected_result | 0 .../cname-to-nxdomain/expected_result.dnssec | 0 .../cname-to-nxdomain/expected_result.narrow | 0 .../cname-to-nxdomain/expected_result.nsec3 | 0 .../{ => tests}/cname-to-referral/command | 0 .../{ => tests}/cname-to-referral/description | 0 .../cname-to-referral/expected_result | 0 .../cname-to-referral/skip-unboundhost | 0 .../{ => tests}/cname-to-unauth-any/command | 0 .../cname-to-unauth-any/description | 0 .../cname-to-unauth-any/expected_result | 0 .../expected_result.dnssec | 0 .../cname-to-unauth-any/skip-unboundhost | 0 .../{ => tests}/cname-to-unauth/command | 0 .../{ => tests}/cname-to-unauth/description | 0 .../cname-to-unauth/expected_result | 0 .../cname-to-unauth/expected_result.dnssec | 0 .../cname-to-unauth/skip-unboundhost | 0 .../{ => tests}/cname-wildcard-chain/command | 0 .../cname-wildcard-chain/description | 0 .../cname-wildcard-chain/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../cname-wildcard-chain/skip-unboundhost | 0 .../cname-wildcard-chain/skip.oracle-nsec3 | 0 .../cross-domain-cname-to-wildcard/command | 0 .../description | 0 .../expected_result | 0 .../{ => tests}/direct-dnskey/command | 0 .../{ => tests}/direct-dnskey/description | 0 .../{ => tests}/direct-dnskey/expected_result | 0 .../direct-dnskey/expected_result.dnssec | 0 .../{ => tests}/direct-rrsig/command | 0 .../{ => tests}/direct-rrsig/description | 0 .../{ => tests}/direct-rrsig/expected_result | 0 .../direct-rrsig/expected_result.dnssec | 0 .../direct-rrsig/expected_result.narrow | 0 .../direct-rrsig/expected_result.nsec3 | 0 .../{ => tests}/direct-rrsig/skip-q | 0 .../{ => tests}/direct-wildcard/command | 0 .../{ => tests}/direct-wildcard/description | 0 .../direct-wildcard/expected_result | 0 .../{ => tests}/double-srv/command | 0 .../{ => tests}/double-srv/description | 0 .../{ => tests}/double-srv/expected_result | 0 regression-tests/{ => tests}/double/command | 0 .../{ => tests}/double/description | 0 .../{ => tests}/double/expected_result | 0 .../{ => tests}/double/expected_result.dnssec | 0 .../{ => tests}/double/skip.mydns | 0 .../{ => tests}/ds-at-apex-noerror/command | 0 .../ds-at-apex-noerror/description | 0 .../ds-at-apex-noerror/expected_result | 0 .../ds-at-apex-noerror/expected_result.dnssec | 0 .../ds-at-apex-noerror/expected_result.narrow | 0 .../ds-at-apex-noerror/expected_result.nsec3 | 0 .../{ => tests}/ds-at-both-sides/command | 0 .../{ => tests}/ds-at-both-sides/description | 0 .../ds-at-both-sides/expected_result | 0 .../ds-at-both-sides/skip.nodnssec | 0 .../ds-at-secure-delegation/command | 0 .../ds-at-secure-delegation/description | 0 .../ds-at-secure-delegation/expected_result | 0 .../expected_result.dnssec | 0 .../ds-at-secure-delegation/skip.mydns | 0 .../ds-at-unsecure-delegation/command | 0 .../ds-at-unsecure-delegation/description | 0 .../ds-at-unsecure-delegation/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../ds-at-unsecure-delegation/skip.nodnssec | 0 .../skip.oracle-nsec | 0 .../ds-at-unsecure-zone-cut/command | 0 .../ds-at-unsecure-zone-cut/description | 0 .../ds-at-unsecure-zone-cut/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../ds-at-unsecure-zone-cut/skip.nodnssec | 0 .../ds-at-unsecure-zone-cut/skip.oracle-nsec | 0 .../{ => tests}/ds-inside-delegation/command | 0 .../ds-inside-delegation/description | 0 .../ds-inside-delegation/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../ds-inside-delegation/skip-unboundhost | 0 .../ds-inside-delegation/skip.oracle-nsec | 0 .../ds-inside-delegation/skip.oracle-nsec3 | 0 regression-tests/{ => tests}/ent-any/command | 0 .../{ => tests}/ent-any/description | 0 .../{ => tests}/ent-any/expected_result | 0 .../ent-any/expected_result.dnssec | 0 .../ent-any/expected_result.narrow | 0 .../{ => tests}/ent-any/expected_result.nsec3 | 0 .../ent-any/expected_result.nsec3-optout | 0 .../{ => tests}/ent-any/skip.noent | 0 .../{ => tests}/ent-asterisk/command | 0 .../{ => tests}/ent-asterisk/description | 0 .../{ => tests}/ent-asterisk/expected_result | 0 .../ent-asterisk/expected_result.dnssec | 2 +- .../ent-asterisk/expected_result.narrow | 0 .../ent-asterisk/expected_result.nsec3 | 0 .../{ => tests}/ent-asterisk/skip.bind | 0 .../{ => tests}/ent-asterisk/skip.noent | 0 regression-tests/{ => tests}/ent-axfr/command | 0 .../{ => tests}/ent-axfr/description | 0 .../{ => tests}/ent-axfr/expected_result | 0 .../ent-axfr/expected_result.nsec3 | 0 .../ent-axfr/expected_result.nsec3-optout | 0 .../{ => tests}/ent-axfr/skip.narrow | 0 .../{ => tests}/ent-axfr/skip.nodnssec | 0 .../{ => tests}/ent-axfr/skip.noent | 0 .../{ => tests}/ent-axfr/use.drill | 0 .../ent-rr-enclosed-in-ent/command | 0 .../ent-rr-enclosed-in-ent/description | 0 .../ent-rr-enclosed-in-ent/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../ent-rr-enclosed-in-ent/skip.nodnssec | 0 .../ent-rr-enclosed-in-ent/skip.noent | 0 regression-tests/{ => tests}/ent-soa/command | 0 .../{ => tests}/ent-soa/description | 0 .../{ => tests}/ent-soa/expected_result | 0 .../ent-soa/expected_result.dnssec | 0 .../ent-soa/expected_result.narrow | 0 .../{ => tests}/ent-soa/expected_result.nsec3 | 0 .../ent-soa/expected_result.nsec3-optout | 0 .../{ => tests}/ent-soa/skip.noent | 0 .../ent-wildcard-below-ent/command | 0 .../ent-wildcard-below-ent/description | 0 .../ent-wildcard-below-ent/expected_result | 0 .../expected_result.dnssec | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../ent-wildcard-below-ent/skip.noent | 0 regression-tests/{ => tests}/ent/command | 0 regression-tests/{ => tests}/ent/description | 0 .../{ => tests}/ent/expected_result | 0 .../{ => tests}/ent/expected_result.dnssec | 0 .../{ => tests}/ent/expected_result.narrow | 0 .../{ => tests}/ent/expected_result.nsec3 | 0 .../ent/expected_result.nsec3-optout | 0 regression-tests/{ => tests}/ent/skip.noent | 0 .../{ => tests}/escaped-txt/command | 0 .../{ => tests}/escaped-txt/description | 0 .../{ => tests}/escaped-txt/expected_result | 0 .../external-cname-pointer/command | 0 .../external-cname-pointer/description | 0 .../external-cname-pointer/expected_result | 0 .../external-cname-pointer/skip-unboundhost | 0 .../{ => tests}/fancy-axfr/command | 0 .../{ => tests}/fancy-axfr/description | 0 .../{ => tests}/fancy-axfr/expected_result | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../skip.nodnssec | 0 .../{ => tests}/five-levels-wildcard/command | 0 .../five-levels-wildcard/description | 0 .../five-levels-wildcard/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../five-levels-wildcard/skip.nodnssec | 0 .../{ => tests}/glue-record/command | 0 .../{ => tests}/glue-record/description | 0 .../{ => tests}/glue-record/expected_result | 0 .../{ => tests}/glue-record/skip-unboundhost | 0 .../{ => tests}/glue-referral/command | 0 .../{ => tests}/glue-referral/description | 0 .../{ => tests}/glue-referral/expected_result | 0 .../glue-referral/skip-unboundhost | 0 .../{ => tests}/internal-referral/command | 0 .../{ => tests}/internal-referral/description | 0 .../internal-referral/expected_result | 0 .../internal-referral/skip-unboundhost | 0 .../{ => tests}/long-name/command | 0 .../{ => tests}/long-name/description | 0 .../{ => tests}/long-name/expected_result | 0 .../{ => tests}/mboxfw-record/command | 0 .../{ => tests}/mboxfw-record/description | 0 .../{ => tests}/mboxfw-record/expected_result | 0 .../{ => tests}/mboxfw-record/skip | 0 .../{ => tests}/minimal-noerror/command | 0 .../{ => tests}/minimal-noerror/description | 0 .../minimal-noerror/expected_result | 0 .../minimal-noerror/expected_result.narrow | 0 .../minimal-noerror/expected_result.nsec3 | 0 .../{ => tests}/minimal-noerror/skip.nodnssec | 0 .../{ => tests}/minimal-nxdomain/command | 0 .../{ => tests}/minimal-nxdomain/description | 0 .../minimal-nxdomain/expected_result | 0 .../minimal-nxdomain/expected_result.narrow | 0 .../minimal-nxdomain/expected_result.nsec3 | 0 .../minimal-nxdomain/skip.nodnssec | 0 .../multi-step-cname-resolution/command | 0 .../multi-step-cname-resolution/description | 0 .../expected_result | 0 .../multi-txt-escape-resolution/command | 0 .../multi-txt-escape-resolution/description | 0 .../expected_result | 0 .../{ => tests}/multi-txt-resolution/command | 0 .../multi-txt-resolution/description | 0 .../multi-txt-resolution/expected_result | 0 .../mx-case-sensitivy-with-ap/command | 0 .../mx-case-sensitivy-with-ap/description | 0 .../mx-case-sensitivy-with-ap/expected_result | 0 .../{ => tests}/mx-to-cname/command | 0 .../{ => tests}/mx-to-cname/description | 0 .../{ => tests}/mx-to-cname/expected_result | 0 .../command | 0 .../description | 0 .../expected_result | 0 regression-tests/{ => tests}/naptr/command | 0 .../{ => tests}/naptr/description | 0 .../{ => tests}/naptr/expected_result | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../{ => tests}/ns-at-delegation/command | 0 .../{ => tests}/ns-at-delegation/description | 0 .../ns-at-delegation/expected_result | 0 .../ns-at-delegation/skip-unboundhost | 0 .../ns-with-identical-glue/command | 0 .../ns-with-identical-glue/description | 0 .../ns-with-identical-glue/expected_result | 0 .../ns-with-identical-glue/skip-unboundhost | 0 .../{ => tests}/nsec-bitmap/command | 0 .../{ => tests}/nsec-bitmap/description | 0 .../{ => tests}/nsec-bitmap/expected_result | 0 .../nsec-bitmap/expected_result.narrow | 0 .../nsec-bitmap/expected_result.nsec3 | 0 .../{ => tests}/nsec-bitmap/skip.nodnssec | 0 .../nsec-glue-at-delegation/command | 0 .../nsec-glue-at-delegation/description | 0 .../nsec-glue-at-delegation/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../expected_result.nsec3-optout | 0 .../nsec-glue-at-delegation/skip.nodnssec | 0 .../nsec-glue-at-delegation/skip.oracle-nsec | 0 .../nsec-glue-at-delegation/skip.oracle-nsec3 | 0 .../{ => tests}/nsec-glue/command | 0 .../{ => tests}/nsec-glue/description | 0 .../{ => tests}/nsec-glue/expected_result | 0 .../nsec-glue/expected_result.narrow | 0 .../nsec-glue/expected_result.nsec3 | 0 .../{ => tests}/nsec-glue/skip.nodnssec | 0 .../{ => tests}/nsec-glue/skip.oracle-nsec | 0 .../{ => tests}/nsec-middle/command | 0 .../{ => tests}/nsec-middle/description | 0 .../{ => tests}/nsec-middle/expected_result | 0 .../nsec-middle/expected_result.narrow | 0 .../nsec-middle/expected_result.nsec3 | 0 .../{ => tests}/nsec-middle/skip.nodnssec | 0 .../{ => tests}/nsec-wildcard/command | 0 .../{ => tests}/nsec-wildcard/description | 0 .../{ => tests}/nsec-wildcard/expected_result | 0 .../nsec-wildcard/expected_result.narrow | 0 .../nsec-wildcard/expected_result.nsec3 | 0 .../{ => tests}/nsec-wildcard/skip.nodnssec | 0 .../{ => tests}/nsec-wraparound/command | 0 .../{ => tests}/nsec-wraparound/description | 0 .../nsec-wraparound/expected_result | 0 .../nsec-wraparound/expected_result.nsec3 | 0 .../{ => tests}/nsec-wraparound/skip.narrow | 0 .../{ => tests}/nsec-wraparound/skip.nodnssec | 0 .../{ => tests}/nsec-wraparound/skip.nsec3 | 0 .../nsec-wrong-type-at-apex/command | 0 .../nsec-wrong-type-at-apex/description | 0 .../nsec-wrong-type-at-apex/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../nsec-wrong-type-at-apex/skip.nodnssec | 0 .../{ => tests}/nsec-wrong-type/command | 0 .../{ => tests}/nsec-wrong-type/description | 0 .../nsec-wrong-type/expected_result | 0 .../nsec-wrong-type/expected_result.narrow | 0 .../nsec-wrong-type/expected_result.nsec3 | 0 .../{ => tests}/nsec-wrong-type/skip.nodnssec | 0 .../nsecx-mode2-wildcard-nodata/command | 0 .../nsecx-mode2-wildcard-nodata/description | 0 .../expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../nsecx-mode2-wildcard-nodata/skip.nodnssec | 0 .../{ => tests}/nsecx-mode3-wildcard/command | 0 .../nsecx-mode3-wildcard/description | 0 .../nsecx-mode3-wildcard/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../nsecx-mode3-wildcard/skip.nodnssec | 0 .../nxdomain-below-nonempty-terminal/command | 0 .../description | 0 .../expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../skip.nodnssec | 0 .../nxdomain-for-unknown-record/command | 0 .../nxdomain-for-unknown-record/description | 0 .../expected_result | 0 .../{ => tests}/obscured-wildcard/command | 0 .../{ => tests}/obscured-wildcard/description | 0 .../obscured-wildcard/expected_result | 0 .../one-step-cname-resolution/command | 0 .../one-step-cname-resolution/description | 0 .../one-step-cname-resolution/expected_result | 0 .../out-of-bailiwick-referral/command | 0 .../out-of-bailiwick-referral/description | 0 .../out-of-bailiwick-referral/expected_result | 0 .../skip-unboundhost | 0 .../{ => tests}/pretty-big-packet/command | 0 .../{ => tests}/pretty-big-packet/description | 0 .../pretty-big-packet/expected_result | 0 regression-tests/{ => tests}/root-srv/command | 0 .../{ => tests}/root-srv/description | 0 .../{ => tests}/root-srv/expected_result | 0 regression-tests/{ => tests}/rp/command | 0 regression-tests/{ => tests}/rp/description | 0 .../{ => tests}/rp/expected_result | 0 .../same-level-referral-soa/command | 0 .../same-level-referral-soa/description | 0 .../same-level-referral-soa/expected_result | 0 .../same-level-referral-soa/skip-unboundhost | 0 .../{ => tests}/same-level-referral/command | 0 .../same-level-referral/description | 0 .../same-level-referral/expected_result | 0 .../same-level-referral/skip-unboundhost | 0 .../{ => tests}/second-level-nxdomain/command | 0 .../second-level-nxdomain/description | 0 .../second-level-nxdomain/expected_result | 0 .../expected_result.narrow | 0 .../expected_result.nsec3 | 0 .../second-level-nxdomain/skip.nodnssec | 0 .../secure-delegation-ds-ns/command | 0 .../secure-delegation-ds-ns/description | 0 .../secure-delegation-ds-ns/expected_result | 0 .../expected_result.dnssec | 0 .../secure-delegation-ds-ns/skip.oracle-nsec | 0 .../secure-delegation-ds-ns/skip.oracle-nsec3 | 0 .../{ => tests}/secure-delegation/command | 0 .../{ => tests}/secure-delegation/description | 0 .../secure-delegation/expected_result | 0 .../secure-delegation/expected_result.dnssec | 0 .../{ => tests}/secure-delegation/skip-drill | 0 .../{ => tests}/space-name/command | 0 .../{ => tests}/space-name/description | 0 .../{ => tests}/space-name/expected_result | 0 .../space-name/expected_result.narrow | 0 .../space-name/expected_result.nsec3 | 0 .../{ => tests}/space-name/skip.nodnssec | 0 .../command | 0 .../description | 0 .../expected_result | 0 .../{ => tests}/too-big-for-udp-query/command | 0 .../too-big-for-udp-query/description | 0 .../too-big-for-udp-query/expected_result | 0 .../{ => tests}/tsig-axfr/command | 0 .../{ => tests}/tsig-axfr/description | 0 .../{ => tests}/tsig-axfr/expected_result | 0 .../{ => tests}/tsig-axfr/skip.narrow | 0 .../{ => tests}/tsig-axfr/skip.nodnssec | 0 .../{ => tests}/tsig-axfr/skip.presigned | 0 .../{ => tests}/two-level-nxdomain/command | 0 .../two-level-nxdomain/description | 0 .../two-level-nxdomain/expected_result | 0 .../two-level-nxdomain/expected_result.narrow | 0 .../two-level-nxdomain/expected_result.nsec3 | 0 .../two-level-nxdomain/skip.nodnssec | 0 .../{ => tests}/underscore-sorting/command | 0 .../underscore-sorting/description | 0 .../underscore-sorting/expected_result | 0 .../underscore-sorting/expected_result.narrow | 0 .../underscore-sorting/expected_result.nsec3 | 0 .../underscore-sorting/skip.nodnssec | 0 .../{ => tests}/unknown-domain/command | 0 .../{ => tests}/unknown-domain/description | 0 .../unknown-domain/expected_result | 0 .../{ => tests}/uppercase-nsec/command | 0 .../{ => tests}/uppercase-nsec/description | 0 .../uppercase-nsec/expected_result | 0 .../uppercase-nsec/expected_result.narrow | 0 .../uppercase-nsec/expected_result.nsec3 | 0 .../{ => tests}/uppercase-nsec/skip.nodnssec | 0 .../{ => tests}/url-record/command | 0 .../{ => tests}/url-record/description | 0 .../{ => tests}/url-record/expected_result | 0 regression-tests/{ => tests}/url-record/skip | 0 .../{ => tests}/verify-dnssec-zone/command | 2 +- .../verify-dnssec-zone/description | 0 .../verify-dnssec-zone/expected_result | 0 .../verify-dnssec-zone/skip.narrow | 0 .../verify-dnssec-zone/skip.nodnssec | 0 .../verify-dnssec-zone/skip.oracle-nsec | 0 .../verify-dnssec-zone/skip.oracle-nsec3 | 0 .../{ => tests}/very-long-txt/command | 0 .../{ => tests}/very-long-txt/description | 0 .../{ => tests}/very-long-txt/expected_result | 0 .../{ => tests}/very-long-txt/skip.bind | 0 .../{ => tests}/very-long-txt/skip.mydns | 0 .../{ => tests}/very-long-txt/skip.nsd | 0 .../wildcard-overlaps-delegation/command | 0 .../wildcard-overlaps-delegation/description | 0 .../expected_result | 0 .../skip-unboundhost | 0 .../{ => tests}/wrong-type-wildcard/command | 0 .../wrong-type-wildcard/description | 0 .../wrong-type-wildcard/expected_result | 0 regression-tests/zones/.gitignore | 10 + regression-tests/{ => zones}/addzone.com | 0 .../{ => zones}/delegated.dnssec-parent.com | 0 .../{ => zones}/dnssec-parent.com | 0 regression-tests/{ => zones}/example.com | 0 regression-tests/{ => zones}/minimal.com | 0 regression-tests/{ => zones}/nztest.com | 0 regression-tests/{ => zones}/powerdnssec.org | 0 .../secure-delegated.dnssec-parent.com | 0 regression-tests/{ => zones}/stest.com | 0 regression-tests/{ => zones}/test.com | 0 regression-tests/{ => zones}/test.dyndns.orig | 0 regression-tests/{ => zones}/tsig.com | 0 regression-tests/{ => zones}/wtest.com | 0 742 files changed, 1379 insertions(+), 1237 deletions(-) create mode 100644 regression-tests/backends/bind-master create mode 100644 regression-tests/backends/bind-slave create mode 100644 regression-tests/backends/common create mode 100644 regression-tests/backends/gmysql-master create mode 100644 regression-tests/backends/gmysql-slave create mode 100644 regression-tests/backends/goracle-master create mode 100644 regression-tests/backends/goracle-slave create mode 100644 regression-tests/backends/gpgsql-master create mode 100644 regression-tests/backends/gsqlite3-master create mode 100644 regression-tests/backends/gsqlite3-slave create mode 100644 regression-tests/backends/mydns-master create mode 100644 regression-tests/backends/opendbx-master create mode 100644 regression-tests/backends/oracle-master create mode 100644 regression-tests/backends/remote-master create mode 100644 regression-tests/backends/tinydns-master create mode 100644 regression-tests/ext/bind-master create mode 100644 regression-tests/ext/bind-slave create mode 100644 regression-tests/ext/nsd-master create mode 100644 regression-tests/ext/nsd-slave create mode 100644 regression-tests/tests/.gitignore rename regression-tests/{ => tests}/00dnssec-grabkeys/command (92%) rename regression-tests/{ => tests}/00dnssec-grabkeys/description (100%) rename regression-tests/{ => tests}/00dnssec-grabkeys/expected_result (100%) rename regression-tests/{ => tests}/0dyndns-prereq-all/command (100%) rename regression-tests/{ => tests}/0dyndns-prereq-all/description (100%) rename regression-tests/{ => tests}/0dyndns-prereq-all/expected_result (100%) rename regression-tests/{ => tests}/0dyndns-prereq-all/skip.nodyndns (100%) rename regression-tests/{ => tests}/0dyndns-prereq-nxrrset-full/command (100%) rename regression-tests/{ => tests}/0dyndns-prereq-nxrrset-full/description (100%) rename regression-tests/{ => tests}/0dyndns-prereq-nxrrset-full/expected_result (100%) rename regression-tests/{ => tests}/0dyndns-prereq-nxrrset-full/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-big-package/command (100%) rename regression-tests/{ => tests}/1dyndns-big-package/description (100%) rename regression-tests/{ => tests}/1dyndns-big-package/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-big-package/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-big-package/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-big-package/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-big-package/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-check-soa-update/command (100%) rename regression-tests/{ => tests}/1dyndns-check-soa-update/description (100%) rename regression-tests/{ => tests}/1dyndns-check-soa-update/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-check-soa-update/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-casesensative/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-casesensative/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-casesensative/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-casesensative/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-cname/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-cname/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-cname/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-cname/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-ds/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-mx/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-mx/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-mx/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-mx/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-wildcard/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-wildcard/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-wildcard/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete-wildcard/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-add-delete/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-invalid-record/command (70%) rename regression-tests/{ => tests}/1dyndns-update-add-invalid-record/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-invalid-record/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-invalid-record/sendupdate.pl (100%) rename regression-tests/{ => tests}/1dyndns-update-add-invalid-record/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-add-soa/command (100%) rename regression-tests/{ => tests}/1dyndns-update-add-soa/description (100%) rename regression-tests/{ => tests}/1dyndns-update-add-soa/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-add-soa/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/command (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/description (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-add-delete/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/command (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/description (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/skip-unboundhost (100%) rename regression-tests/{ => tests}/1dyndns-update-deep-delegate/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate-in-between/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/skip-unboundhost (100%) rename regression-tests/{ => tests}/1dyndns-update-delegate/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-add-host/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-add-host/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-add-host/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-add-host/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-multi-add-host/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-multi-add-host/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-multi-add-host/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-multi-add-host/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-mx-prio/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-mx-prio/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-mx-prio/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-mx-prio/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-ns/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-ns/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-ns/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-ns/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-parent-delegate/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-soa/command (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-soa/description (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-soa/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-delete-soa/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/command (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/description (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/expected_result.dnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/expected_result.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-in-between/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/command (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/description (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/skip.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/skip.nodnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params-with-others/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/command (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/description (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/skip.narrow (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/skip.nodnssec (100%) rename regression-tests/{ => tests}/1dyndns-update-nsec3params/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-a-host/command (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-a-host/description (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-a-host/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-a-host/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-cname/command (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-cname/description (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-cname/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-cname/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-mx/command (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-mx/description (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-mx/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-replace-mx/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-srv/command (100%) rename regression-tests/{ => tests}/1dyndns-update-srv/description (100%) rename regression-tests/{ => tests}/1dyndns-update-srv/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-srv/skip.nodyndns (100%) rename regression-tests/{ => tests}/1dyndns-update-update-ttl/command (100%) rename regression-tests/{ => tests}/1dyndns-update-update-ttl/description (100%) rename regression-tests/{ => tests}/1dyndns-update-update-ttl/expected_result (100%) rename regression-tests/{ => tests}/1dyndns-update-update-ttl/skip.nodyndns (100%) rename regression-tests/{ => tests}/2dyndns-update-replace-soa/command (100%) rename regression-tests/{ => tests}/2dyndns-update-replace-soa/description (100%) rename regression-tests/{ => tests}/2dyndns-update-replace-soa/expected_result (100%) rename regression-tests/{ => tests}/2dyndns-update-replace-soa/skip.nodyndns (100%) rename regression-tests/{ => tests}/5dyndns-restore-zone/command (100%) rename regression-tests/{ => tests}/5dyndns-restore-zone/description (100%) rename regression-tests/{ => tests}/5dyndns-restore-zone/expected_result (100%) rename regression-tests/{ => tests}/5dyndns-restore-zone/skip.nodyndns (100%) rename regression-tests/{ => tests}/8bit-txt-unescaped/command (100%) rename regression-tests/{ => tests}/8bit-txt-unescaped/description (100%) rename regression-tests/{ => tests}/8bit-txt-unescaped/expected_result (100%) rename regression-tests/{ => tests}/8bit-txt/command (100%) rename regression-tests/{ => tests}/8bit-txt/description (100%) rename regression-tests/{ => tests}/8bit-txt/expected_result (100%) rename regression-tests/{ => tests}/any-nxdomain/command (100%) rename regression-tests/{ => tests}/any-nxdomain/description (100%) rename regression-tests/{ => tests}/any-nxdomain/expected_result (100%) rename regression-tests/{ => tests}/any-nxdomain/expected_result.dnssec (100%) rename regression-tests/{ => tests}/any-nxdomain/expected_result.narrow (100%) rename regression-tests/{ => tests}/any-nxdomain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/any-query/command (100%) rename regression-tests/{ => tests}/any-query/description (100%) rename regression-tests/{ => tests}/any-query/expected_result (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/command (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/description (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/expected_result (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/expected_result.narrow (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/any-wildcard-dnssec/skip.nodnssec (100%) rename regression-tests/{ => tests}/any-wildcard/command (100%) rename regression-tests/{ => tests}/any-wildcard/description (100%) rename regression-tests/{ => tests}/any-wildcard/expected_result (100%) rename regression-tests/{ => tests}/apex-level-a-but-no-a/command (100%) rename regression-tests/{ => tests}/apex-level-a-but-no-a/description (100%) rename regression-tests/{ => tests}/apex-level-a-but-no-a/expected_result (100%) rename regression-tests/{ => tests}/apex-level-a/command (100%) rename regression-tests/{ => tests}/apex-level-a/description (100%) rename regression-tests/{ => tests}/apex-level-a/expected_result (100%) rename regression-tests/{ => tests}/apex-level-ns/command (100%) rename regression-tests/{ => tests}/apex-level-ns/description (100%) rename regression-tests/{ => tests}/apex-level-ns/expected_result (100%) rename regression-tests/{ => tests}/basic-a-resolution/command (100%) rename regression-tests/{ => tests}/basic-a-resolution/description (100%) rename regression-tests/{ => tests}/basic-a-resolution/expected_result (100%) rename regression-tests/{ => tests}/basic-aaaa-resolution/command (100%) rename regression-tests/{ => tests}/basic-aaaa-resolution/description (100%) rename regression-tests/{ => tests}/basic-aaaa-resolution/expected_result (100%) rename regression-tests/{ => tests}/basic-eui48/command (100%) rename regression-tests/{ => tests}/basic-eui48/description (100%) rename regression-tests/{ => tests}/basic-eui48/expected_result (100%) rename regression-tests/{ => tests}/basic-eui48/skip.bind (100%) rename regression-tests/{ => tests}/basic-eui48/skip.mydns (100%) rename regression-tests/{ => tests}/basic-eui48/skip.nsd (100%) rename regression-tests/{ => tests}/basic-eui64/command (100%) rename regression-tests/{ => tests}/basic-eui64/description (100%) rename regression-tests/{ => tests}/basic-eui64/expected_result (100%) rename regression-tests/{ => tests}/basic-eui64/skip.bind (100%) rename regression-tests/{ => tests}/basic-eui64/skip.mydns (100%) rename regression-tests/{ => tests}/basic-eui64/skip.nsd (100%) rename regression-tests/{ => tests}/basic-hinfo/command (100%) rename regression-tests/{ => tests}/basic-hinfo/description (100%) rename regression-tests/{ => tests}/basic-hinfo/expected_result (100%) rename regression-tests/{ => tests}/basic-loc/command (100%) rename regression-tests/{ => tests}/basic-loc/description (100%) rename regression-tests/{ => tests}/basic-loc/expected_result (100%) rename regression-tests/{ => tests}/basic-loc/skip.mydns (100%) rename regression-tests/{ => tests}/basic-nonzone/command (100%) rename regression-tests/{ => tests}/basic-nonzone/description (100%) rename regression-tests/{ => tests}/basic-nonzone/expected_result (100%) rename regression-tests/{ => tests}/basic-nonzone/skip-unboundhost (100%) rename regression-tests/{ => tests}/basic-ns-resolution/command (100%) rename regression-tests/{ => tests}/basic-ns-resolution/description (100%) rename regression-tests/{ => tests}/basic-ns-resolution/expected_result (100%) rename regression-tests/{ => tests}/basic-soa-resolution/command (100%) rename regression-tests/{ => tests}/basic-soa-resolution/description (100%) rename regression-tests/{ => tests}/basic-soa-resolution/expected_result (100%) rename regression-tests/{ => tests}/basic-srv/command (100%) rename regression-tests/{ => tests}/basic-srv/description (100%) rename regression-tests/{ => tests}/basic-srv/expected_result (100%) rename regression-tests/{ => tests}/basic-txt-resolution/command (100%) rename regression-tests/{ => tests}/basic-txt-resolution/description (100%) rename regression-tests/{ => tests}/basic-txt-resolution/expected_result (100%) rename regression-tests/{ => tests}/big-axfr/command (100%) rename regression-tests/{ => tests}/big-axfr/description (100%) rename regression-tests/{ => tests}/big-axfr/expected_result (100%) rename regression-tests/{ => tests}/bind-add-zone/command (63%) rename regression-tests/{ => tests}/bind-add-zone/description (100%) rename regression-tests/{ => tests}/bind-add-zone/expected_result (100%) rename regression-tests/{ => tests}/bind-add-zone/expected_result.bind (97%) rename regression-tests/{ => tests}/bind-add-zone/skip.presigned (100%) rename regression-tests/{ => tests}/bind-add-zone/stress/README (100%) rename regression-tests/{ => tests}/bind-add-zone/stress/addzones.sh (100%) rename regression-tests/{ => tests}/bind-add-zone/stress/createzones.sh (100%) rename regression-tests/{ => tests}/bind-add-zone/stress/dnsperf.sh (100%) rename regression-tests/{ => tests}/bind-add-zone/stress/run.sh (100%) rename regression-tests/{ => tests}/cname-and-wildcard-at-root/command (100%) rename regression-tests/{ => tests}/cname-and-wildcard-at-root/description (100%) rename regression-tests/{ => tests}/cname-and-wildcard-at-root/expected_result (100%) rename regression-tests/{ => tests}/cname-and-wildcard-but-no-correct-type/command (100%) rename regression-tests/{ => tests}/cname-and-wildcard-but-no-correct-type/description (100%) rename regression-tests/{ => tests}/cname-and-wildcard-but-no-correct-type/expected_result (100%) rename regression-tests/{ => tests}/cname-and-wildcard/command (100%) rename regression-tests/{ => tests}/cname-and-wildcard/description (100%) rename regression-tests/{ => tests}/cname-and-wildcard/expected_result (100%) rename regression-tests/{ => tests}/cname-but-no-correct-type/command (100%) rename regression-tests/{ => tests}/cname-but-no-correct-type/description (100%) rename regression-tests/{ => tests}/cname-but-no-correct-type/expected_result (100%) rename regression-tests/{ => tests}/cname-loop-breakout/command (100%) rename regression-tests/{ => tests}/cname-loop-breakout/description (100%) rename regression-tests/{ => tests}/cname-loop-breakout/expected_result (100%) rename regression-tests/{ => tests}/cname-loop-breakout/skip-unboundhost (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/command (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/description (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/expected_result (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/expected_result.dnssec (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/expected_result.narrow (100%) rename regression-tests/{ => tests}/cname-to-nxdomain-any/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/command (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/description (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/expected_result (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/expected_result.dnssec (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/expected_result.narrow (100%) rename regression-tests/{ => tests}/cname-to-nxdomain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/cname-to-referral/command (100%) rename regression-tests/{ => tests}/cname-to-referral/description (100%) rename regression-tests/{ => tests}/cname-to-referral/expected_result (100%) rename regression-tests/{ => tests}/cname-to-referral/skip-unboundhost (100%) rename regression-tests/{ => tests}/cname-to-unauth-any/command (100%) rename regression-tests/{ => tests}/cname-to-unauth-any/description (100%) rename regression-tests/{ => tests}/cname-to-unauth-any/expected_result (100%) rename regression-tests/{ => tests}/cname-to-unauth-any/expected_result.dnssec (100%) rename regression-tests/{ => tests}/cname-to-unauth-any/skip-unboundhost (100%) rename regression-tests/{ => tests}/cname-to-unauth/command (100%) rename regression-tests/{ => tests}/cname-to-unauth/description (100%) rename regression-tests/{ => tests}/cname-to-unauth/expected_result (100%) rename regression-tests/{ => tests}/cname-to-unauth/expected_result.dnssec (100%) rename regression-tests/{ => tests}/cname-to-unauth/skip-unboundhost (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/command (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/description (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/expected_result (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/expected_result.dnssec (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/expected_result.narrow (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/skip-unboundhost (100%) rename regression-tests/{ => tests}/cname-wildcard-chain/skip.oracle-nsec3 (100%) rename regression-tests/{ => tests}/cross-domain-cname-to-wildcard/command (100%) rename regression-tests/{ => tests}/cross-domain-cname-to-wildcard/description (100%) rename regression-tests/{ => tests}/cross-domain-cname-to-wildcard/expected_result (100%) rename regression-tests/{ => tests}/direct-dnskey/command (100%) rename regression-tests/{ => tests}/direct-dnskey/description (100%) rename regression-tests/{ => tests}/direct-dnskey/expected_result (100%) rename regression-tests/{ => tests}/direct-dnskey/expected_result.dnssec (100%) rename regression-tests/{ => tests}/direct-rrsig/command (100%) rename regression-tests/{ => tests}/direct-rrsig/description (100%) rename regression-tests/{ => tests}/direct-rrsig/expected_result (100%) rename regression-tests/{ => tests}/direct-rrsig/expected_result.dnssec (100%) rename regression-tests/{ => tests}/direct-rrsig/expected_result.narrow (100%) rename regression-tests/{ => tests}/direct-rrsig/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/direct-rrsig/skip-q (100%) rename regression-tests/{ => tests}/direct-wildcard/command (100%) rename regression-tests/{ => tests}/direct-wildcard/description (100%) rename regression-tests/{ => tests}/direct-wildcard/expected_result (100%) rename regression-tests/{ => tests}/double-srv/command (100%) rename regression-tests/{ => tests}/double-srv/description (100%) rename regression-tests/{ => tests}/double-srv/expected_result (100%) rename regression-tests/{ => tests}/double/command (100%) rename regression-tests/{ => tests}/double/description (100%) rename regression-tests/{ => tests}/double/expected_result (100%) rename regression-tests/{ => tests}/double/expected_result.dnssec (100%) rename regression-tests/{ => tests}/double/skip.mydns (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/command (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/description (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/expected_result (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/expected_result.narrow (100%) rename regression-tests/{ => tests}/ds-at-apex-noerror/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ds-at-both-sides/command (100%) rename regression-tests/{ => tests}/ds-at-both-sides/description (100%) rename regression-tests/{ => tests}/ds-at-both-sides/expected_result (100%) rename regression-tests/{ => tests}/ds-at-both-sides/skip.nodnssec (100%) rename regression-tests/{ => tests}/ds-at-secure-delegation/command (100%) rename regression-tests/{ => tests}/ds-at-secure-delegation/description (100%) rename regression-tests/{ => tests}/ds-at-secure-delegation/expected_result (100%) rename regression-tests/{ => tests}/ds-at-secure-delegation/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ds-at-secure-delegation/skip.mydns (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/command (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/description (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/expected_result (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/expected_result.narrow (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/skip.nodnssec (100%) rename regression-tests/{ => tests}/ds-at-unsecure-delegation/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/command (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/description (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/expected_result (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/expected_result.narrow (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/skip.nodnssec (100%) rename regression-tests/{ => tests}/ds-at-unsecure-zone-cut/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/ds-inside-delegation/command (100%) rename regression-tests/{ => tests}/ds-inside-delegation/description (100%) rename regression-tests/{ => tests}/ds-inside-delegation/expected_result (100%) rename regression-tests/{ => tests}/ds-inside-delegation/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ds-inside-delegation/expected_result.narrow (100%) rename regression-tests/{ => tests}/ds-inside-delegation/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ds-inside-delegation/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ds-inside-delegation/skip-unboundhost (100%) rename regression-tests/{ => tests}/ds-inside-delegation/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/ds-inside-delegation/skip.oracle-nsec3 (100%) rename regression-tests/{ => tests}/ent-any/command (100%) rename regression-tests/{ => tests}/ent-any/description (100%) rename regression-tests/{ => tests}/ent-any/expected_result (100%) rename regression-tests/{ => tests}/ent-any/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ent-any/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent-any/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-any/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ent-any/skip.noent (100%) rename regression-tests/{ => tests}/ent-asterisk/command (100%) rename regression-tests/{ => tests}/ent-asterisk/description (100%) rename regression-tests/{ => tests}/ent-asterisk/expected_result (100%) rename regression-tests/{ => tests}/ent-asterisk/expected_result.dnssec (86%) rename regression-tests/{ => tests}/ent-asterisk/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent-asterisk/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-asterisk/skip.bind (100%) rename regression-tests/{ => tests}/ent-asterisk/skip.noent (100%) rename regression-tests/{ => tests}/ent-axfr/command (100%) rename regression-tests/{ => tests}/ent-axfr/description (100%) rename regression-tests/{ => tests}/ent-axfr/expected_result (100%) rename regression-tests/{ => tests}/ent-axfr/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-axfr/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ent-axfr/skip.narrow (100%) rename regression-tests/{ => tests}/ent-axfr/skip.nodnssec (100%) rename regression-tests/{ => tests}/ent-axfr/skip.noent (100%) rename regression-tests/{ => tests}/ent-axfr/use.drill (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/command (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/description (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/expected_result (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/skip.nodnssec (100%) rename regression-tests/{ => tests}/ent-rr-enclosed-in-ent/skip.noent (100%) rename regression-tests/{ => tests}/ent-soa/command (100%) rename regression-tests/{ => tests}/ent-soa/description (100%) rename regression-tests/{ => tests}/ent-soa/expected_result (100%) rename regression-tests/{ => tests}/ent-soa/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ent-soa/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent-soa/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-soa/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ent-soa/skip.noent (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/command (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/description (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/expected_result (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent-wildcard-below-ent/skip.noent (100%) rename regression-tests/{ => tests}/ent/command (100%) rename regression-tests/{ => tests}/ent/description (100%) rename regression-tests/{ => tests}/ent/expected_result (100%) rename regression-tests/{ => tests}/ent/expected_result.dnssec (100%) rename regression-tests/{ => tests}/ent/expected_result.narrow (100%) rename regression-tests/{ => tests}/ent/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/ent/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/ent/skip.noent (100%) rename regression-tests/{ => tests}/escaped-txt/command (100%) rename regression-tests/{ => tests}/escaped-txt/description (100%) rename regression-tests/{ => tests}/escaped-txt/expected_result (100%) rename regression-tests/{ => tests}/external-cname-pointer/command (100%) rename regression-tests/{ => tests}/external-cname-pointer/description (100%) rename regression-tests/{ => tests}/external-cname-pointer/expected_result (100%) rename regression-tests/{ => tests}/external-cname-pointer/skip-unboundhost (100%) rename regression-tests/{ => tests}/fancy-axfr/command (100%) rename regression-tests/{ => tests}/fancy-axfr/description (100%) rename regression-tests/{ => tests}/fancy-axfr/expected_result (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/command (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/description (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/expected_result (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/expected_result.narrow (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/five-levels-wildcard-one-below-apex/skip.nodnssec (100%) rename regression-tests/{ => tests}/five-levels-wildcard/command (100%) rename regression-tests/{ => tests}/five-levels-wildcard/description (100%) rename regression-tests/{ => tests}/five-levels-wildcard/expected_result (100%) rename regression-tests/{ => tests}/five-levels-wildcard/expected_result.narrow (100%) rename regression-tests/{ => tests}/five-levels-wildcard/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/five-levels-wildcard/skip.nodnssec (100%) rename regression-tests/{ => tests}/glue-record/command (100%) rename regression-tests/{ => tests}/glue-record/description (100%) rename regression-tests/{ => tests}/glue-record/expected_result (100%) rename regression-tests/{ => tests}/glue-record/skip-unboundhost (100%) rename regression-tests/{ => tests}/glue-referral/command (100%) rename regression-tests/{ => tests}/glue-referral/description (100%) rename regression-tests/{ => tests}/glue-referral/expected_result (100%) rename regression-tests/{ => tests}/glue-referral/skip-unboundhost (100%) rename regression-tests/{ => tests}/internal-referral/command (100%) rename regression-tests/{ => tests}/internal-referral/description (100%) rename regression-tests/{ => tests}/internal-referral/expected_result (100%) rename regression-tests/{ => tests}/internal-referral/skip-unboundhost (100%) rename regression-tests/{ => tests}/long-name/command (100%) rename regression-tests/{ => tests}/long-name/description (100%) rename regression-tests/{ => tests}/long-name/expected_result (100%) rename regression-tests/{ => tests}/mboxfw-record/command (100%) rename regression-tests/{ => tests}/mboxfw-record/description (100%) rename regression-tests/{ => tests}/mboxfw-record/expected_result (100%) rename regression-tests/{ => tests}/mboxfw-record/skip (100%) rename regression-tests/{ => tests}/minimal-noerror/command (100%) rename regression-tests/{ => tests}/minimal-noerror/description (100%) rename regression-tests/{ => tests}/minimal-noerror/expected_result (100%) rename regression-tests/{ => tests}/minimal-noerror/expected_result.narrow (100%) rename regression-tests/{ => tests}/minimal-noerror/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/minimal-noerror/skip.nodnssec (100%) rename regression-tests/{ => tests}/minimal-nxdomain/command (100%) rename regression-tests/{ => tests}/minimal-nxdomain/description (100%) rename regression-tests/{ => tests}/minimal-nxdomain/expected_result (100%) rename regression-tests/{ => tests}/minimal-nxdomain/expected_result.narrow (100%) rename regression-tests/{ => tests}/minimal-nxdomain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/minimal-nxdomain/skip.nodnssec (100%) rename regression-tests/{ => tests}/multi-step-cname-resolution/command (100%) rename regression-tests/{ => tests}/multi-step-cname-resolution/description (100%) rename regression-tests/{ => tests}/multi-step-cname-resolution/expected_result (100%) rename regression-tests/{ => tests}/multi-txt-escape-resolution/command (100%) rename regression-tests/{ => tests}/multi-txt-escape-resolution/description (100%) rename regression-tests/{ => tests}/multi-txt-escape-resolution/expected_result (100%) rename regression-tests/{ => tests}/multi-txt-resolution/command (100%) rename regression-tests/{ => tests}/multi-txt-resolution/description (100%) rename regression-tests/{ => tests}/multi-txt-resolution/expected_result (100%) rename regression-tests/{ => tests}/mx-case-sensitivy-with-ap/command (100%) rename regression-tests/{ => tests}/mx-case-sensitivy-with-ap/description (100%) rename regression-tests/{ => tests}/mx-case-sensitivy-with-ap/expected_result (100%) rename regression-tests/{ => tests}/mx-to-cname/command (100%) rename regression-tests/{ => tests}/mx-to-cname/description (100%) rename regression-tests/{ => tests}/mx-to-cname/expected_result (100%) rename regression-tests/{ => tests}/mx-with-simple-additional-processing/command (100%) rename regression-tests/{ => tests}/mx-with-simple-additional-processing/description (100%) rename regression-tests/{ => tests}/mx-with-simple-additional-processing/expected_result (100%) rename regression-tests/{ => tests}/naptr/command (100%) rename regression-tests/{ => tests}/naptr/description (100%) rename regression-tests/{ => tests}/naptr/expected_result (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist-ns/command (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist-ns/description (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist-ns/expected_result (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist/command (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist/description (100%) rename regression-tests/{ => tests}/non-existing-record-other-types-exist/expected_result (100%) rename regression-tests/{ => tests}/ns-at-delegation/command (100%) rename regression-tests/{ => tests}/ns-at-delegation/description (100%) rename regression-tests/{ => tests}/ns-at-delegation/expected_result (100%) rename regression-tests/{ => tests}/ns-at-delegation/skip-unboundhost (100%) rename regression-tests/{ => tests}/ns-with-identical-glue/command (100%) rename regression-tests/{ => tests}/ns-with-identical-glue/description (100%) rename regression-tests/{ => tests}/ns-with-identical-glue/expected_result (100%) rename regression-tests/{ => tests}/ns-with-identical-glue/skip-unboundhost (100%) rename regression-tests/{ => tests}/nsec-bitmap/command (100%) rename regression-tests/{ => tests}/nsec-bitmap/description (100%) rename regression-tests/{ => tests}/nsec-bitmap/expected_result (100%) rename regression-tests/{ => tests}/nsec-bitmap/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-bitmap/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-bitmap/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/command (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/description (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/expected_result (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/expected_result.nsec3-optout (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/nsec-glue-at-delegation/skip.oracle-nsec3 (100%) rename regression-tests/{ => tests}/nsec-glue/command (100%) rename regression-tests/{ => tests}/nsec-glue/description (100%) rename regression-tests/{ => tests}/nsec-glue/expected_result (100%) rename regression-tests/{ => tests}/nsec-glue/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-glue/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-glue/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-glue/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/nsec-middle/command (100%) rename regression-tests/{ => tests}/nsec-middle/description (100%) rename regression-tests/{ => tests}/nsec-middle/expected_result (100%) rename regression-tests/{ => tests}/nsec-middle/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-middle/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-middle/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-wildcard/command (100%) rename regression-tests/{ => tests}/nsec-wildcard/description (100%) rename regression-tests/{ => tests}/nsec-wildcard/expected_result (100%) rename regression-tests/{ => tests}/nsec-wildcard/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-wildcard/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-wildcard/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-wraparound/command (100%) rename regression-tests/{ => tests}/nsec-wraparound/description (100%) rename regression-tests/{ => tests}/nsec-wraparound/expected_result (100%) rename regression-tests/{ => tests}/nsec-wraparound/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-wraparound/skip.narrow (100%) rename regression-tests/{ => tests}/nsec-wraparound/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-wraparound/skip.nsec3 (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/command (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/description (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/expected_result (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-wrong-type-at-apex/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsec-wrong-type/command (100%) rename regression-tests/{ => tests}/nsec-wrong-type/description (100%) rename regression-tests/{ => tests}/nsec-wrong-type/expected_result (100%) rename regression-tests/{ => tests}/nsec-wrong-type/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsec-wrong-type/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsec-wrong-type/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/command (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/description (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/expected_result (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsecx-mode2-wildcard-nodata/skip.nodnssec (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/command (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/description (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/expected_result (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/expected_result.narrow (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nsecx-mode3-wildcard/skip.nodnssec (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/command (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/description (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/expected_result (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/expected_result.narrow (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/nxdomain-below-nonempty-terminal/skip.nodnssec (100%) rename regression-tests/{ => tests}/nxdomain-for-unknown-record/command (100%) rename regression-tests/{ => tests}/nxdomain-for-unknown-record/description (100%) rename regression-tests/{ => tests}/nxdomain-for-unknown-record/expected_result (100%) rename regression-tests/{ => tests}/obscured-wildcard/command (100%) rename regression-tests/{ => tests}/obscured-wildcard/description (100%) rename regression-tests/{ => tests}/obscured-wildcard/expected_result (100%) rename regression-tests/{ => tests}/one-step-cname-resolution/command (100%) rename regression-tests/{ => tests}/one-step-cname-resolution/description (100%) rename regression-tests/{ => tests}/one-step-cname-resolution/expected_result (100%) rename regression-tests/{ => tests}/out-of-bailiwick-referral/command (100%) rename regression-tests/{ => tests}/out-of-bailiwick-referral/description (100%) rename regression-tests/{ => tests}/out-of-bailiwick-referral/expected_result (100%) rename regression-tests/{ => tests}/out-of-bailiwick-referral/skip-unboundhost (100%) rename regression-tests/{ => tests}/pretty-big-packet/command (100%) rename regression-tests/{ => tests}/pretty-big-packet/description (100%) rename regression-tests/{ => tests}/pretty-big-packet/expected_result (100%) rename regression-tests/{ => tests}/root-srv/command (100%) rename regression-tests/{ => tests}/root-srv/description (100%) rename regression-tests/{ => tests}/root-srv/expected_result (100%) rename regression-tests/{ => tests}/rp/command (100%) rename regression-tests/{ => tests}/rp/description (100%) rename regression-tests/{ => tests}/rp/expected_result (100%) rename regression-tests/{ => tests}/same-level-referral-soa/command (100%) rename regression-tests/{ => tests}/same-level-referral-soa/description (100%) rename regression-tests/{ => tests}/same-level-referral-soa/expected_result (100%) rename regression-tests/{ => tests}/same-level-referral-soa/skip-unboundhost (100%) rename regression-tests/{ => tests}/same-level-referral/command (100%) rename regression-tests/{ => tests}/same-level-referral/description (100%) rename regression-tests/{ => tests}/same-level-referral/expected_result (100%) rename regression-tests/{ => tests}/same-level-referral/skip-unboundhost (100%) rename regression-tests/{ => tests}/second-level-nxdomain/command (100%) rename regression-tests/{ => tests}/second-level-nxdomain/description (100%) rename regression-tests/{ => tests}/second-level-nxdomain/expected_result (100%) rename regression-tests/{ => tests}/second-level-nxdomain/expected_result.narrow (100%) rename regression-tests/{ => tests}/second-level-nxdomain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/second-level-nxdomain/skip.nodnssec (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/command (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/description (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/expected_result (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/expected_result.dnssec (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/secure-delegation-ds-ns/skip.oracle-nsec3 (100%) rename regression-tests/{ => tests}/secure-delegation/command (100%) rename regression-tests/{ => tests}/secure-delegation/description (100%) rename regression-tests/{ => tests}/secure-delegation/expected_result (100%) rename regression-tests/{ => tests}/secure-delegation/expected_result.dnssec (100%) rename regression-tests/{ => tests}/secure-delegation/skip-drill (100%) rename regression-tests/{ => tests}/space-name/command (100%) rename regression-tests/{ => tests}/space-name/description (100%) rename regression-tests/{ => tests}/space-name/expected_result (100%) rename regression-tests/{ => tests}/space-name/expected_result.narrow (100%) rename regression-tests/{ => tests}/space-name/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/space-name/skip.nodnssec (100%) rename regression-tests/{ => tests}/too-big-for-udp-query-no-truncate-additional/command (100%) rename regression-tests/{ => tests}/too-big-for-udp-query-no-truncate-additional/description (100%) rename regression-tests/{ => tests}/too-big-for-udp-query-no-truncate-additional/expected_result (100%) rename regression-tests/{ => tests}/too-big-for-udp-query/command (100%) rename regression-tests/{ => tests}/too-big-for-udp-query/description (100%) rename regression-tests/{ => tests}/too-big-for-udp-query/expected_result (100%) rename regression-tests/{ => tests}/tsig-axfr/command (100%) rename regression-tests/{ => tests}/tsig-axfr/description (100%) rename regression-tests/{ => tests}/tsig-axfr/expected_result (100%) rename regression-tests/{ => tests}/tsig-axfr/skip.narrow (100%) rename regression-tests/{ => tests}/tsig-axfr/skip.nodnssec (100%) rename regression-tests/{ => tests}/tsig-axfr/skip.presigned (100%) rename regression-tests/{ => tests}/two-level-nxdomain/command (100%) rename regression-tests/{ => tests}/two-level-nxdomain/description (100%) rename regression-tests/{ => tests}/two-level-nxdomain/expected_result (100%) rename regression-tests/{ => tests}/two-level-nxdomain/expected_result.narrow (100%) rename regression-tests/{ => tests}/two-level-nxdomain/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/two-level-nxdomain/skip.nodnssec (100%) rename regression-tests/{ => tests}/underscore-sorting/command (100%) rename regression-tests/{ => tests}/underscore-sorting/description (100%) rename regression-tests/{ => tests}/underscore-sorting/expected_result (100%) rename regression-tests/{ => tests}/underscore-sorting/expected_result.narrow (100%) rename regression-tests/{ => tests}/underscore-sorting/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/underscore-sorting/skip.nodnssec (100%) rename regression-tests/{ => tests}/unknown-domain/command (100%) rename regression-tests/{ => tests}/unknown-domain/description (100%) rename regression-tests/{ => tests}/unknown-domain/expected_result (100%) rename regression-tests/{ => tests}/uppercase-nsec/command (100%) rename regression-tests/{ => tests}/uppercase-nsec/description (100%) rename regression-tests/{ => tests}/uppercase-nsec/expected_result (100%) rename regression-tests/{ => tests}/uppercase-nsec/expected_result.narrow (100%) rename regression-tests/{ => tests}/uppercase-nsec/expected_result.nsec3 (100%) rename regression-tests/{ => tests}/uppercase-nsec/skip.nodnssec (100%) rename regression-tests/{ => tests}/url-record/command (100%) rename regression-tests/{ => tests}/url-record/description (100%) rename regression-tests/{ => tests}/url-record/expected_result (100%) rename regression-tests/{ => tests}/url-record/skip (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/command (89%) rename regression-tests/{ => tests}/verify-dnssec-zone/description (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/expected_result (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/skip.narrow (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/skip.nodnssec (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/skip.oracle-nsec (100%) rename regression-tests/{ => tests}/verify-dnssec-zone/skip.oracle-nsec3 (100%) rename regression-tests/{ => tests}/very-long-txt/command (100%) rename regression-tests/{ => tests}/very-long-txt/description (100%) rename regression-tests/{ => tests}/very-long-txt/expected_result (100%) rename regression-tests/{ => tests}/very-long-txt/skip.bind (100%) rename regression-tests/{ => tests}/very-long-txt/skip.mydns (100%) rename regression-tests/{ => tests}/very-long-txt/skip.nsd (100%) rename regression-tests/{ => tests}/wildcard-overlaps-delegation/command (100%) rename regression-tests/{ => tests}/wildcard-overlaps-delegation/description (100%) rename regression-tests/{ => tests}/wildcard-overlaps-delegation/expected_result (100%) rename regression-tests/{ => tests}/wildcard-overlaps-delegation/skip-unboundhost (100%) rename regression-tests/{ => tests}/wrong-type-wildcard/command (100%) rename regression-tests/{ => tests}/wrong-type-wildcard/description (100%) rename regression-tests/{ => tests}/wrong-type-wildcard/expected_result (100%) create mode 100644 regression-tests/zones/.gitignore rename regression-tests/{ => zones}/addzone.com (100%) rename regression-tests/{ => zones}/delegated.dnssec-parent.com (100%) rename regression-tests/{ => zones}/dnssec-parent.com (100%) rename regression-tests/{ => zones}/example.com (100%) rename regression-tests/{ => zones}/minimal.com (100%) rename regression-tests/{ => zones}/nztest.com (100%) rename regression-tests/{ => zones}/powerdnssec.org (100%) rename regression-tests/{ => zones}/secure-delegated.dnssec-parent.com (100%) rename regression-tests/{ => zones}/stest.com (100%) rename regression-tests/{ => zones}/test.com (100%) rename regression-tests/{ => zones}/test.dyndns.orig (100%) rename regression-tests/{ => zones}/tsig.com (100%) rename regression-tests/{ => zones}/wtest.com (100%) diff --git a/.travis.yml b/.travis.yml index 29510d165..fbee9c9f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ script: - sleep 3 - ./clean.sh - cd ../regression-tests - - touch verify-dnssec-zone/allow-missing + - touch tests/verify-dnssec-zone/allow-missing - ./start-test-stop 5300 bind-both - ./start-test-stop 5300 bind-dnssec-both - ./start-test-stop 5300 bind-dnssec-nsec3-both diff --git a/modules/tinydnsbackend/generate-data.sh b/modules/tinydnsbackend/generate-data.sh index 4a67ba206..e547071fa 100755 --- a/modules/tinydnsbackend/generate-data.sh +++ b/modules/tinydnsbackend/generate-data.sh @@ -18,11 +18,11 @@ fi # Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well) -for zone in $(grep zone ../../regression-tests/named.conf | cut -f2 -d\") +for zone in $(grep 'zone ' ../../regression-tests/named.conf | cut -f2 -d\") do - if [ -f ../../regression-tests/$zone.orig ] + if [ -f ../../regression-tests/zones/$zone.orig ] then - cp -f ../../regression-tests/$zone.orig ../../regression-tests/$zone + cp -f ../../regression-tests/zones/$zone.orig ../../regression-tests/zones/$zone fi done @@ -42,7 +42,7 @@ sleep 5 cd $startdir [ -e data ] && rm data -for zone in $(grep zone ../../regression-tests/named.conf | cut -f2 -d\") +for zone in $(grep 'zone ' ../../regression-tests/named.conf | cut -f2 -d\") do $tcpclient 127.0.0.1 5300 $axfrget $zone $zone.out $zone.out.tmp cat $zone.out >> data diff --git a/regression-tests.nobackend/edns-packet-cache/named.conf b/regression-tests.nobackend/edns-packet-cache/named.conf index 26dc6adfd..e94fe49cf 100644 --- a/regression-tests.nobackend/edns-packet-cache/named.conf +++ b/regression-tests.nobackend/edns-packet-cache/named.conf @@ -1,5 +1,5 @@ options { - directory "../regression-tests/"; + directory "../regression-tests/zones/"; recursion no; listen-on port 5300 { 127.0.0.1; diff --git a/regression-tests.nobackend/tinydns-data-check/command b/regression-tests.nobackend/tinydns-data-check/command index 5f8b09545..4a8c746fe 100755 --- a/regression-tests.nobackend/tinydns-data-check/command +++ b/regression-tests.nobackend/tinydns-data-check/command @@ -1,7 +1,7 @@ #!/usr/bin/env bash -for zone in `cat ../regression-tests/named.conf | grep zone | cut -f 2 -d \"` +for zone in `cat ../regression-tests/named.conf | grep 'zone ' | cut -f 2 -d \"` do - md5sum ../regression-tests/$zone + md5sum ../regression-tests/zones/$zone done md5sum ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result index ae1ccf6bf..311bd03c5 100644 --- a/regression-tests.nobackend/tinydns-data-check/expected_result +++ b/regression-tests.nobackend/tinydns-data-check/expected_result @@ -1,12 +1,12 @@ -4bc48a8d9b8d04b553be67639e5656e8 ../regression-tests/example.com -4e9eed426f0cd123c08dffb9e715824a ../regression-tests/test.com -005b3381db2a7dc70b690484f6ab7770 ../regression-tests/test.dyndns -21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/wtest.com -42b442de632686e94bde75acf66cf524 ../regression-tests/nztest.com -6e4ac6e3a6cd717df107a7bc2e466ac7 ../regression-tests/dnssec-parent.com -6510bf48aa3ca3501b73a1f510852a34 ../regression-tests/delegated.dnssec-parent.com -a63dc120391d9df0003f2ec4f461a6af ../regression-tests/secure-delegated.dnssec-parent.com -24514dc104b22206daeb973ff9303545 ../regression-tests/minimal.com -0b20d7a0250576451135483b863750bf ../regression-tests/tsig.com -b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/stest.com +4bc48a8d9b8d04b553be67639e5656e8 ../regression-tests/zones/example.com +4e9eed426f0cd123c08dffb9e715824a ../regression-tests/zones/test.com +005b3381db2a7dc70b690484f6ab7770 ../regression-tests/zones/test.dyndns +21213b4e8cd56e4184696a1bafd987d7 ../regression-tests/zones/wtest.com +42b442de632686e94bde75acf66cf524 ../regression-tests/zones/nztest.com +6e4ac6e3a6cd717df107a7bc2e466ac7 ../regression-tests/zones/dnssec-parent.com +6510bf48aa3ca3501b73a1f510852a34 ../regression-tests/zones/delegated.dnssec-parent.com +a63dc120391d9df0003f2ec4f461a6af ../regression-tests/zones/secure-delegated.dnssec-parent.com +24514dc104b22206daeb973ff9303545 ../regression-tests/zones/minimal.com +0b20d7a0250576451135483b863750bf ../regression-tests/zones/tsig.com +b1f775045fa2cf0a3b91aa834af06e49 ../regression-tests/zones/stest.com 80927ffb754402270483d06c0ebeaaad ../modules/tinydnsbackend/data.cdb diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore index 892e1b69f..b354825e9 100644 --- a/regression-tests/.gitignore +++ b/regression-tests/.gitignore @@ -1,6 +1,3 @@ -diff -real_result -*.out /*.xml /*.tar /K* @@ -16,12 +13,7 @@ real_result /*.controlsocket /pdns-*.conf /*.sqlite3* -/*.com-slave -/*.dyndns-slave /named-slave.conf -*/start -*/step.* -/test.dyndns /bulktest.results /recursor-bulktest/ /recursor.log @@ -30,11 +22,6 @@ real_result /report.json /nsd.* /nsd-slave.* -/*.nsd -/ixfr*.db -/ixfr*.state -/*.signed -/*.bind /dsset-* /bind.conf /bind-slave.conf diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master new file mode 100644 index 000000000..9081fc37e --- /dev/null +++ b/regression-tests/backends/bind-master @@ -0,0 +1,61 @@ +case $context in + bind) + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=bind --bind-config=./named.conf \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config \ + --bind-ignore-broken-records=yes & + skipreasons="nodnssec nodyndns" + bindwait + ;; + + bind-dnssec | bind-dnssec-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow) + rm -f dnssec.sqlite3 + ../pdns/pdnssec --config-dir=. create-bind-db dnssec.sqlite3 + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + securezone $zone + if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-dnssec-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + elif [ $context = bind-dnssec-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + fi + done + + if [ $context = bind-dnssec-nsec3 ] + then + extracontexts="bind dnssec nsec3" + skipreasons="nsec3 nodyndns" + elif [ $context = bind-dnssec-nsec3-optout ] + then + extracontexts="bind dnssec nsec3 nsec3-optout" + skipreasons="optout nodyndns" + elif [ $context = bind-dnssec-nsec3-narrow ] + then + extracontexts="bind dnssec narrow" + skipreasons="narrow nodyndns" + else + extracontexts="bind dnssec" + skipreasons="nodyndns" + fi + + ../pdns/pdnssec --config-dir=. import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. activate-tsig-key tsig.com test master + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=bind --bind-config=./named.conf \ + --bind-dnssec-db=./dnssec.sqlite3 \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ + --cache-ttl=$cachettl --no-config \ + --bind-ignore-broken-records=yes $lua_prequery & + bindwait + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/bind-slave b/regression-tests/backends/bind-slave new file mode 100644 index 000000000..0ddd00134 --- /dev/null +++ b/regression-tests/backends/bind-slave @@ -0,0 +1,35 @@ + context=${context}-presigned + sed -e 's/type master;/type slave;\n\tmasters { 127.0.0.1:'$port'; };/' -e 's/file "\([^"]\+\)/file "\1-slave/' < named.conf > named-slave.conf + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + rm -rf zones/$zone-slave + done + + rm -f dnssec-slave.sqlite3 + + ../pdns/pdnssec --config-dir=. create-bind-db dnssec-slave.sqlite3 + + set +e + echo $skipreasons | grep -q nodnssec + if [ $? -ne 0 ] + then + sqlite3 dnssec-slave.sqlite3 "INSERT INTO tsigkeys (name, algorithm,secret) VALUES('test', '$ALGORITHM', '$KEY')" + sqlite3 dnssec-slave.sqlite3 "INSERT INTO domainmetadata (domain, kind, content) SELECT 'tsig.com', 'AXFR-MASTER-TSIG', 'test'" + echo $skipreasons | grep -q nolua + if [ $? -ne 0 ] + then + sqlite3 dnssec-slave.sqlite3 "INSERT INTO domainmetadata (domain,kind,content) SELECT 'stest.com','AXFR-SOURCE','127.0.0.2'" + fi + fi + set -e + + port=$((port+100)) + + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=bind --bind-config=./named-slave.conf --slave \ + --send-root-referral --retrieval-threads=1 --config-name=bind-slave \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 & + echo 'waiting for zones to be loaded' + bindwait bind-slave diff --git a/regression-tests/backends/common b/regression-tests/backends/common new file mode 100644 index 000000000..bf9267a7d --- /dev/null +++ b/regression-tests/backends/common @@ -0,0 +1,108 @@ +start_master () +{ + case $context in + bind*) + source ./backends/bind-master + ;; + + gmysql*) + source ./backends/gmysql-master + ;; + + goracle*) + source ./backends/goracle-master + ;; + + gpgsql*) + source ./backends/gpgsql-master + ;; + + gsqlite3*) + source ./backends/gsqlite3-master + ;; + + mydns*) + source ./backends/mydns-master + ;; + + opendbx*) + source ./backends/opendbx-master + ;; + + oracle*) + source ./backends/oracle-master + ;; + + remote*) + source ./backends/remote-master + ;; + + tinydns*) + source ./backends/tinydns-master + ;; + + ext-nsd*) + source ./ext/nsd-master + ;; + + ext-bind*) + source ./ext/bind-master + ;; + + *) + nocontext=yes + esac + + if [ "$nocontext" == "yes" ] + then + echo unknown context $context + : > passed_tests + echo 'unknown-context-'"$context" > failed_tests + ./toxml $context + exit + fi +} + +start_slave () +{ + skipreasons="$skipreasons presigned nodyndns" + + case $presignedcontext in + bind*) + source ./backends/bind-slave + ;; + + gmysql*) + source ./backends/gmysql-slave + ;; + + goracle*) + source ./backends/goracle-slave + ;; + + gsqlite3*) + source ./backends/gsqlite3-slave + ;; + + + ext-bind*) + source ./ext/bind-slave + ;; + + ext-nsd*) + source ./ext/nsd-slave + ;; + + *) + nocontext=yes + esac + + if [ "$nocontext" == "yes" ] + then + echo unknown presigned context $presignedcontext + : > passed_tests + echo 'unknown-presigned-context-'"$presignedcontext" > failed_tests + ./toxml $context + exit + fi +} diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master new file mode 100644 index 000000000..55ec5621c --- /dev/null +++ b/regression-tests/backends/gmysql-master @@ -0,0 +1,112 @@ +case $context in + gmysql-nodnssec) + [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest + [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root + [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost + [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' + + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ + || echo ignoring mysqladmin drop failure + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" + mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql + + tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" + + cat > pdns-gmysql.conf << __EOF__ +launch=gmysql +gmysql-dbname=$GMYSQLDB +gmysql-user=$GMYSQLUSER +gmysql-host=$GMYSQLHOST +gmysql-password=$GMYSQLPASSWD +__EOF__ + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 + done + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gmysql \ + --master --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ + --cache-ttl=$cachettl --no-config \ + --gmysql-dbname="$GMYSQLDB" \ + --gmysql-user="$GMYSQLUSER" \ + --gmysql-host="$GMYSQLHOST" \ + --gmysql-password="$GMYSQLPASSWD" & + skipreasons=nodnssec + ;; + + gmysql | gmysql-nsec3 | gmysql-nsec3-optout |gmysql-nsec3-narrow) + [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest + [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root + [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost + [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' + + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ + || echo ignoring mysqladmin drop failure + mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" + mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql + mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql + + tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ + "$GMYSQLDB" + + cat > pdns-gmysql.conf << __EOF__ +launch=gmysql +gmysql-dbname=$GMYSQLDB +gmysql-user=$GMYSQLUSER +gmysql-host=$GMYSQLHOST +gmysql-password=$GMYSQLPASSWD +gmysql-dnssec +__EOF__ + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + securezone $zone gmysql + if [ $context = gmysql-nsec3 ] || [ $context = gmysql-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 + elif [ $context = gmysql-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 + fi + done + + ../pdns/pdnssec --config-dir=. --config-name=gmysql import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=gmysql activate-tsig-key tsig.com test master + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch --launch+=random --launch+=gmysql --launch+=random --gmysql-dnssec \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ + --cache-ttl=$cachettl --no-config \ + --gmysql-dbname="$GMYSQLDB" \ + --gmysql-user="$GMYSQLUSER" \ + --gmysql-host="$GMYSQLHOST" \ + --gmysql-password="$GMYSQLPASSWD" $lua_prequery & + if [ $context = gmysql-nsec3 ] + then + extracontexts="dnssec nsec3" + skipreasons="nsec3" + elif [ $context = gmysql-nsec3-optout ] + then + extracontexts="dnssec nsec3 nsec3-optout" + skipreasons="optout" + elif [ $context = gmysql-nsec3-narrow ] + then + extracontexts="dnssec narrow" + skipreasons="narrow" + else + extracontexts="dnssec" + fi + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave new file mode 100644 index 000000000..72d7f58fb --- /dev/null +++ b/regression-tests/backends/gmysql-slave @@ -0,0 +1,67 @@ + context=${context}-presigned + [ -z "$GMYSQL2DB" ] && GMYSQL2DB=pdnstest2 + [ -z "$GMYSQL2USER" ] && GMYSQL2USER=root + [ -z "$GMYSQL2HOST" ] && GMYSQL2HOST=localhost + [ -z "$GMYSQL2PASSWD" ] && GMYSQL2PASSWD='' + + mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" --force drop "$GMYSQL2DB" \ + || echo ignoring mysqladmin drop failure + mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" create "$GMYSQL2DB" + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ + "$GMYSQL2DB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ + "$GMYSQL2DB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) + do + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ + "$GMYSQL2DB" \ + -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" + done + + set +e + echo $skipreasons | grep -q nodnssec + if [ $? -ne 0 ] + then + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ + -e "INSERT INTO tsigkeys (name, algorithm,secret) VALUES('test', '$ALGORITHM', '$KEY')" + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ + -e "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" + echo $skipreasons | grep -q nolua + if [ $? -ne 0 ] + then + mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ + -e "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" + fi + fi + set -e + + port=$((port+100)) + + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gmysql --gmysql-dnssec \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --query-cache-ttl=$cachettl --no-config --slave --retrieval-threads=4 \ + --gmysql-dbname="$GMYSQL2DB" \ + --gmysql-user="$GMYSQL2USER" \ + --gmysql-host="$GMYSQL2HOST" \ + --gmysql-password="$GMYSQL2PASSWD" \ + --config-name=gmysql2 & + echo 'waiting for zones to be slaved' + loopcount=0 + while [ $loopcount -lt 20 ] + do + sleep 5 + todo=$(mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQl2HOST" \ + "$GMYSQL2DB" -ss -e 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') + if [ $todo = 0 ] + then + break + fi + let loopcount=loopcount+1 + done + if [ $todo -ne 0 ] + then + echo "AXFR FAILED" >> failed_tests + fi diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master new file mode 100644 index 000000000..56938fcdc --- /dev/null +++ b/regression-tests/backends/goracle-master @@ -0,0 +1,66 @@ +case $context in + goracle-nodnssec | goracle | goracle-nsec3 | goracle-nsec3-optout) + [ -z "$GORACLEUSER" ] && GORACLEUSER=pdns + [ -z "$GORACLEPASSWD" ] && GORACLEPASSWD=pdns + + echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe > goracle.log + echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log + tosql goracle | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log + + cat > pdns-goracle.conf << __EOF__ +launch=goracle +goracle-home=$ORACLE_HOME +goracle-sid=$ORACLE_SID +goracle-nls-lang=$NLS_LANG + +goracle-tnsname=xe +goracle-user=$GORACLEUSER +goracle-password=$GORACLEPASSWD +__EOF__ + + if [ $context != goracle-nodnssec ] + then + echo "goracle-dnssec" >> pdns-goracle.conf + ../pdns/pdnssec --config-dir=. --config-name=goracle import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=goracle activate-tsig-key tsig.com test master + fi + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + if [ $context != goracle-nodnssec ] + then + securezone $zone goracle + if [ $context = goracle-nsec3 ] || [ $context = goracle-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 + fi + else + ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 + fi + done + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ + --config-name=goracle --socket-dir=./ --no-shuffle \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl $lua_prequery & + + skipreasons="nodyndns" + if [ $context = goracle-nsec3 ] + then + extracontexts="dnssec nsec3" + elif [ $context = goracle-nsec3-optout ] + then + extracontexts="dnssec nsec3 nsec3-optout" + elif [ $context = goracle-nodnssec ] + then + skipreasons="nodnssec nodyndns" + else + extracontexts="dnssec" + fi + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave new file mode 100644 index 000000000..6231538c3 --- /dev/null +++ b/regression-tests/backends/goracle-slave @@ -0,0 +1,66 @@ + context=${context}-presigned + [ -z "$GORACLE2USER" ] && GORACLE2USER=pdns2 + [ -z "$GORACLE2PASSWD" ] && GORACLE2PASSWD=pdns + + echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe > goracle2.log + echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log + + cat > pdns-goracle2.conf << __EOF__ +launch=goracle +goracle-home=$ORACLE_HOME +goracle-sid=$ORACLE_SID +goracle-nls-lang=$NLS_LANG + +goracle-tnsname=xe +goracle-user=$GORACLE2USER +goracle-password=$GORACLE2PASSWD +goracle-dnssec +__EOF__ + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) + do + echo "INSERT INTO domains (id, name, type, master) VALUES(domains_id_sequence.nextval, '$zone', 'SLAVE', '127.0.0.1:$port');" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log + done + + set +e + echo $skipreasons | grep -q nodnssec + if [ $? -ne 0 ] + then + ../pdns/pdnssec --config-dir=. --config-name=goracle2 import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=goracle2 activate-tsig-key tsig.com test master + echo $skipreasons | grep -q nolua + if [ $? -ne 0 ] + then + ../pdns/pdnssec --config-dir=. --config-name=goracle2 set-meta stest.com AXFR-SOURCE 127.0.0.2 + fi + fi + set -e + + port=$((port+100)) + + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \ + --config-name=goracle2 --socket-dir=./ --no-shuffle \ + --send-root-referral --slave --retrieval-threads=4 \ + --slave-cycle-interval=300 --config-name=goracle2 & + echo 'waiting for zones to be slaved' + + loopcount=0 + while [ $loopcount -lt 40 ] + do + sleep 5 + todo=$(sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe << __EOF__ +set pagesize 0 feedback off verify off heading off echo off; +SELECT COUNT(id) FROM domains WHERE last_check IS NULL; +exit; +__EOF__ +) + if [ $todo = 0 ] + then + break + fi + let loopcount=loopcount+1 + done + if [ $todo -ne 0 ] + then + echo "AXFR FAILED" >> failed_tests + fi diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master new file mode 100644 index 000000000..3fcc90891 --- /dev/null +++ b/regression-tests/backends/gpgsql-master @@ -0,0 +1,88 @@ +case $context in + gpgsql-nodnssec) + [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest + [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) + + dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure + createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql + + tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c + + cat > pdns-gpgsql.conf << __EOF__ +launch=gpgsql +gpgsql-dbname=$GPGSQLDB +gpgsql-user=$GPGSQLUSER +__EOF__ + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 + done + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gpgsql \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config \ + --gpgsql-dbname="$GPGSQLDB" \ + --gpgsql-user="$GPGSQLUSER" & + skipreasons="nodnssec nodyndns" + ;; + + + gpgsql | gpgsql-nsec3 | gpgsql-nsec3-optout) + [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest + [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) + + dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring dropdb failure + createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring createdb failure # FIXME + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/dnssec.schema.pgsql.sql + + tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c + + cat > pdns-gpgsql.conf << __EOF__ +launch=gpgsql +gpgsql-dbname=$GPGSQLDB +gpgsql-user=$GPGSQLUSER +gpgsql-dnssec +__EOF__ + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + securezone $zone gpgsql + if [ $context = gpgsql-nsec3 ] || [ $context = gpgsql-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 + fi + done + + ../pdns/pdnssec --config-dir=. --config-name=gpgsql import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=gpgsql activate-tsig-key tsig.com test master + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gpgsql --gpgsql-dnssec \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config \ + --gpgsql-dbname="$GPGSQLDB" \ + --gpgsql-user="$GPGSQLUSER" $lua_prequery & + if [ $context = gpgsql-nsec3 ] + then + extracontexts="dnssec nsec3" + elif [ $context = gpgsql-nsec3-optout ] + then + extracontexts="dnssec nsec3 nsec3-optout" + elif [ $context = gpgsql-nsec3-narrow ] + then + extracontexts="dnssec narrow" + else + extracontexts="dnssec" + fi + skipreasons="nodyndns" + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master new file mode 100644 index 000000000..8677e1e95 --- /dev/null +++ b/regression-tests/backends/gsqlite3-master @@ -0,0 +1,71 @@ +case $context in + gsqlite3-nodnssec) + rm -f pdns.sqlite3 + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + tosql gsqlite | sqlite3 pdns.sqlite3 + echo ANALYZE\; | sqlite3 pdns.sqlite3 + + cat > pdns-gsqlite3.conf << __EOF__ +launch=gsqlite3 +gsqlite3-database=pdns.sqlite3 +__EOF__ + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 + done + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gsqlite3 \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config \ + --gsqlite3-database=pdns.sqlite3 & + skipreasons="nodnssec nodyndns" + ;; + + gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout) + rm -f pdns.sqlite3 + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql + tosql gsqlite | sqlite3 pdns.sqlite3 + echo ANALYZE\; | sqlite3 pdns.sqlite3 + + cat > pdns-gsqlite3.conf << __EOF__ +launch=gsqlite3 +gsqlite3-database=pdns.sqlite3 +gsqlite3-dnssec +__EOF__ + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + securezone $zone gsqlite3 + if [ $context = gsqlite3-nsec3 ] || [ $context = gsqlite3-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 + fi + done + + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 activate-tsig-key tsig.com test master + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --no-config \ + --gsqlite3-database=pdns.sqlite3 $lua_prequery & + if [ $context = gsqlite3-nsec3 ] + then + extracontexts="dnssec nsec3" + elif [ $context = gsqlite3-nsec3-optout ] + then + extracontexts="dnssec nsec3 nsec3-optout" + else + extracontexts="dnssec" + fi + skipreasons="nodyndns" + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave new file mode 100644 index 000000000..2e169b80a --- /dev/null +++ b/regression-tests/backends/gsqlite3-slave @@ -0,0 +1,54 @@ + context=${context}-presigned + rm -f pdns.sqlite31 + sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) + do + sqlite3 pdns.sqlite31 "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port');" + done + + set +e + echo $skipreasons | grep -q nodnssec + if [ $? -ne 0 ] + then + sqlite3 pdns.sqlite31 "INSERT INTO tsigkeys (name,algorithm,secret) VALUES('test','$ALGORITHM', '$KEY')" + sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" + echo $skipreasons | grep -q nolua + if [ $? -ne 0 ] + then + sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" + fi + fi + set -e + + port=$((port+100)) + + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ + --fancy-records --send-root-referral \ + --cache-ttl=0 --query-cache-ttl=0 --no-config --slave --retrieval-threads=4 \ + --gsqlite3-database=pdns.sqlite31 --gsqlite3-pragma-synchronous=0 \ + --config-name=gsqlite32 |& egrep -v "update records set ordername|insert into records" & + echo 'waiting for zones to be slaved' + set +e + loopcount=0 + while [ $loopcount -lt 20 ] + do + sleep 5 + todo=$(sqlite3 pdns.sqlite31 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') + if [ $todo -eq 0 ] + then + if [ $todo = 0 ] + then + break + fi + fi + let loopcount=loopcount+1 + done + if [ $todo -ne 0 ] + then + echo "AXFR FAILED" >> failed_tests + fi + set -e + sqlite3 pdns.sqlite31 ANALYZE; diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master new file mode 100644 index 000000000..610555408 --- /dev/null +++ b/regression-tests/backends/mydns-master @@ -0,0 +1,38 @@ +case $context in + mydns) + [ -z "$MYDNSDB" ] && MYDNSDB=pdnstest + [ -z "$MYDNSUSER" ] && MYDNSUSER=root + [ -z "$MYDNSHOST" ] && MYDNSHOST=localhost + [ -z "$MYDNSPASSWD" ] && MYDNSPASSWD='' + + mysqladmin --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" --force drop "$MYDNSDB" \ + || echo ignoring mysqladmin drop failure + mysqladmin --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" create "$MYDNSDB" + mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ + "$MYDNSDB" < ../modules/mydnsbackend/schema.sql + + tosql mydns | grep -v 'double\.example\.com' | mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ + "$MYDNSDB" + + cat > pdns-mydns.conf << __EOF__ +launch=mydns +mydns-dbname=$MYDNSDB +mydns-user=$MYDNSUSER +mydns-host=$MYDNSHOST +mydns-password=$MYDNSPASSWD +__EOF__ + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=mydns \ + --master --send-root-referral \ + --cache-ttl=0 --no-config \ + --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no \ + --mydns-dbname="$MYDNSDB" \ + --mydns-user="$MYDNSUSER" \ + --mydns-host="$MYDNSHOST" \ + --mydns-password="$MYDNSPASSWD" & + skipreasons="nodnssec noent nodyndns" + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master new file mode 100644 index 000000000..a8a53487e --- /dev/null +++ b/regression-tests/backends/opendbx-master @@ -0,0 +1,21 @@ +case $context in + opendbx-sqlite3) + rm -f pdns-opendbx.sqlite3 + sqlite3 pdns-opendbx.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + tosql gsqlite | sqlite3 pdns-opendbx.sqlite3 + sqlite3 pdns-opendbx.sqlite3 "ALTER TABLE domains ADD status CHARACTER(1) NOT NULL DEFAULT 'A'; \ + ALTER TABLE domains ADD auto_serial INTEGER DEFAULT 0;" + echo ANALYZE\; | sqlite3 pdns-opendbx.sqlite3 + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=opendbx \ + --send-root-referral \ + --cache-ttl=$cachettl --no-config \ + --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \ + --opendbx-database=pdns-opendbx.sqlite3 & + skipreasons="nodnssec noent nodyndns" + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master new file mode 100644 index 000000000..013cc5177 --- /dev/null +++ b/regression-tests/backends/oracle-master @@ -0,0 +1,68 @@ +case $context in + oracle-nodnssec | oracle | oracle-nsec3) + [ -z "$ORACLEUSER" ] && ORACLEUSER=pdns + [ -z "$ORACLEPASSWD" ] && ORACLEPASSWD=pdns + + echo "START ../modules/oraclebackend/dropschema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe > oracle.log + echo "START ../modules/oraclebackend/schema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + ../pdns/zone2sql --oracle | grep -v 'INSERT INTO Records' | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + ../pdns/zone2sql --oracle | grep " 'SOA', " | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + + cat > pdns-oracle.conf << __EOF__ +launch=oracle +oracle-home=$ORACLE_HOME +oracle-sid=$ORACLE_SID +oracle-nls-lang=$NLS_LANG + +oracle-pool-database=xe +oracle-pool-username=$ORACLEUSER +oracle-pool-password=$ORACLEPASSWD +oracle-master-database=xe +oracle-master-username=$ORACLEUSER +oracle-master-password=$ORACLEPASSWD +__EOF__ + + if [ $context != oracle-nodnssec ] + then + echo "oracle-dnssec" >> pdns-oracle.conf + ../pdns/pdnssec --config-dir=. --config-name=oracle import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=oracle activate-tsig-key tsig.com test master + fi + + if [ $context != oracle-nodnssec ] + then + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + securezone $zone oracle + if [ $context = oracle-nsec3 ] + then + ../pdns/pdnssec --config-dir=. --config-name=oracle set-nsec3 $zone "1 0 1 abcd" 2>&1 + fi + done + fi + + echo "TRUNCATE TABLE records;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + ../pdns/zone2sql --oracle | grep -v 'INSERT INTO Zones' | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ + --config-name=oracle --socket-dir=./ --no-shuffle \ + --send-root-referral --query-logging \ + --cache-ttl=$cachettl $lua_prequery & + + if [ $context = oracle-nsec3 ] + then + skipreasons="nodyndns oracle-nsec3" + extracontexts="dnssec nsec3" + elif [ $context = oracle-nodnssec ] + then + skipreasons="nodyndns nodnssec" + else + skipreasons="nodyndns oracle-nsec" + extracontexts="dnssec" + fi + skipreasons="$skipreasons noent" # TODO add ent support to oracle backend + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master new file mode 100644 index 000000000..b6df19fdf --- /dev/null +++ b/regression-tests/backends/remote-master @@ -0,0 +1,121 @@ +case $context in + remotebackend-*) + remotetype=$(echo $context | cut -d- -f 2) + remotesec=$(echo $context | cut -d- -f 3) + narrow=$(echo $context | cut -d- -f 4) + testsdir=../modules/remotebackend/regression-tests/ + + # cleanup unbound-host.conf to avoid failures + rm -f unbound-host.conf + + echo "Setting up test database..." + # setup test database + rm -f $testsdir/remote.sqlite3 + sqlite3 $testsdir/remote.sqlite3 < $testsdir/test-schema.sql + chmod 0666 $testsdir/remote.sqlite3 + + case $remotetype in + http) + connstr="http:url=http://localhost:62434/dns" + rm -f remotebackend-server.log + rm -f remotebackend-access.log + $testsdir/http-backend.rb & + echo $! > pdns-remotebackend.pid + set +e + # make sure it runs before continuing + loopcount=0 + while [ $loopcount -lt 20 ]; do + res=$(curl http://localhost:62434/ping 2>/dev/null) + if [ "x$res" == "xpong" ] + then + break + fi + sleep 1 + let loopcount=loopcount+1 + done + set -e + ;; + zeromq) + connstr="zeromq:endpoint=ipc:///tmp/pdns.0" + $testsdir/zeromq-backend.rb & + echo $! > pdns-remotebackend.pid + ;; + unix) + connstr="unix:path=/tmp/remote.socket" + socat unix-listen:/tmp/remote.socket,fork exec:$testsdir/unix-backend.rb & + echo $! > pdns-remotebackend.pid + ;; + pipe) + connstr="pipe:command=$testsdir/pipe-backend.rb" + ;; + *) + echo "Invalid usage" + exit + ;; + esac + + skipreasons="nodnssec nodyndns" + + if [ "$remotesec" = "nsec3" ] + then + remotedosec="yes" + if [ "$narrow" = "narrow" ] + then + extracontexts="dnssec nsec3 narrow" + skipreasons="narrow nsec3 nodyndns" + else + extracontexts="dnssec nsec3" + skipreasons="nsec3 nodyndns" + fi + + remote_add_param="--remote-dnssec=yes" + elif [ "$remotesec" = "dnssec" ] + then + remotedosec="yes" + remote_add_param="--remote-dnssec=yes" + extracontexts="dnssec" + skipreasons="nonsec3 nonarrow nodyndns" + fi + + + # generate pdns.conf for pdnssec + cat > pdns-remote.conf <> pdns-remote.conf + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1 + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2 + ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3 + + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 4 + ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 5 + ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 6 + + if [ "$remotesec" = "nsec3" ] + then + ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 example.com + ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 up.example.com + fi + fi + + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=remote \ + --query-logging --loglevel=9 --cache-ttl=$cachettl --no-config \ + --send-root-referral --distributor-threads=1 \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --remote-connection-string="$connstr" $remote_add_param & + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master new file mode 100644 index 000000000..63b64b1cd --- /dev/null +++ b/regression-tests/backends/tinydns-master @@ -0,0 +1,14 @@ +case $context in + tinydns) + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --no-shuffle --launch=tinydns \ + --cache-ttl=$cachettl --no-config \ + --send-root-referral \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --tinydns-dbfile=../modules/tinydnsbackend/data.cdb & + skipreasons="nodnssec noent nodyndns" + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/ext/bind-master b/regression-tests/ext/bind-master new file mode 100644 index 000000000..bd2fa1068 --- /dev/null +++ b/regression-tests/ext/bind-master @@ -0,0 +1,120 @@ +bindfix () +{ + sed -e 's/"A very .*"/"shorter"/' < zones/test.com > zones/test.com.bind + sed -e '/EUI/s/^/;/g' -e '/host\.\*\.sub/s/^/;/g' < zones/example.com > zones/example.com.bind + sed -e '/DS\t44030/s/^/;/g' < zones/delegated.dnssec-parent.com > zones/delegated.dnssec-parent.com.bind +} + +tobind () +{ + cat > bind.conf << __EOF__ +options { + directory "./zones"; + dnssec-enable yes; + listen-on port $port { 127.0.0.1; }; + minimal-responses yes; + pid-file "../pdns.pid"; +}; + +key test { + algorithm $ALGORITHM; + secret "$KEY"; +}; +__EOF__ + + rm -f K* + rm -f zones/*.bind + + bindfix + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + + if [ ! -f zones/$zone.bind ] + then + cp zones/$zone zones/$zone.bind + fi + + if [ "$1" != "unsigned" ] + then + if [ ! "${zone: 0:16}" = "secure-delegated" ] + then + ksk=$(dnssec-keygen -r/dev/urandom -f KSK -a RSASHA256 -b 2048 -n ZONE $zone) + else + cp secure-delegated.dnssec-parent.com.private Ksecure-delegated.dnssec-parent.com.+008+54319.private + cp secure-delegated.dnssec-parent.com.key Ksecure-delegated.dnssec-parent.com.+008+54319.key + ksk="Ksecure-delegated.dnssec-parent.com.+008+54319" + fi + zsk=$(dnssec-keygen -r/dev/urandom -a RSASHA256 -b 1024 -n ZONE $zone) + + echo "\$include $ksk.key ; KSK" >> zones/$zone.bind + echo "\$include $zsk.key ; ZSK" >> zones/$zone.bind + fi + + case $1 in + nsec) + dnssec-signzone -o $zone -f zones/$zone.signed zones/$zone.bind + ;; + nsec3) + dnssec-signzone -3 abcd -H 1 -o $zone -f zones/$zone.signed zones/$zone.bind + ;; + nsec3-optout) + dnssec-signzone -3 abcd -H 1 -A -o $zone -f zones/$zone.signed zones/$zone.bind + if [ "$zone" = "dnssec-parent.com" ] + then + echo "insecure.dnssec-parent.com. IN NS ns.insecure.dnssec-parent.com." >> zones/${zone}.signed + fi + ;; + unsigned) + cp zones/${zone}.bind zones/${zone}.signed + ;; + *) + echo 'tobind called with wrong param' + exit + esac + + echo "" >> bind.conf + echo "zone \"${zone}\" {" >> bind.conf + echo " type master;" >> bind.conf + if [ "${zone}" = "tsig.com" ] + then + echo " allow-transfer { key test; none; };" >> bind.conf + fi + echo " file \"${zone}.signed\";" >> bind.conf + echo "};" >> bind.conf + done +} + +case $context in + ext-bind | ext-bind-nsec | ext-bind-nsec3 | ext-bind-nsec3-optout) + case $context in + ext-bind) + tobind unsigned + extracontexts="extbind" + skipreasons="bind nodnssec nodyndns" + ;; + ext-bind-nsec) + tobind nsec + extracontexts="extbind dnssec" + skipreasons="bind nodyndns" + ;; + ext-bind-nsec3) + tobind nsec3 + extracontexts="extbind dnssec nsec3" + skipreasons="bind nsec3 nodyndns" + ;; + ext-bind-nsec3-optout) + tobind nsec3-optout + extracontexts="extbind dnssec nsec3 nsec3-optout" + skipreasons="bind optout nodyndns" + ;; + *) + nocontext=yes + esac + named -c bind.conf -g & + sleep 5 + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/ext/bind-slave b/regression-tests/ext/bind-slave new file mode 100644 index 000000000..b66cf90a6 --- /dev/null +++ b/regression-tests/ext/bind-slave @@ -0,0 +1,39 @@ + skipreasons="$skipreasons bind" + context=$context-presigned + cat > bind-slave.conf << __EOF__ +options { + directory "./zones"; + dnssec-enable yes; + listen-on port $(($port+100)) { 127.0.0.1; }; + minimal-responses yes; + pid-file "../pdns-slave.pid"; +}; + +key test { + algorithm $ALGORITHM; + secret "$KEY"; +}; +__EOF__ + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + rm -f $zone-slave + + echo "" >> bind-slave.conf + echo "zone \"${zone}\" {" >> bind-slave.conf + echo " type slave;" >> bind-slave.conf + echo " file \"${zone}-slave\";" >> bind-slave.conf + if [ "${zone}" = "tsig.com" ] + then + echo " masters port $port { 127.0.0.1 key test; };" >> bind-slave.conf + echo " allow-transfer { key test; none; };" >> bind-slave.conf + else + echo " masters port $port { 127.0.0.1; };" >> bind-slave.conf + fi + echo "};" >> bind-slave.conf + done + + port=$((port+100)) + + named -c bind-slave.conf -g & + sleep 20 diff --git a/regression-tests/ext/nsd-master b/regression-tests/ext/nsd-master new file mode 100644 index 000000000..d8607e821 --- /dev/null +++ b/regression-tests/ext/nsd-master @@ -0,0 +1,123 @@ +nsdfix () +{ + sed -e 's/"A very .*"/"shorter"/' < zones/test.com > zones/test.com.nsd + sed '/EUI/s/^/;/g' < zones/example.com > zones/example.com.nsd + sed -e '/testnonzone\.com\./s/^/;/g' -e '/NZTEST\.COM\.NET\./s/^/;/g' < zones/nztest.com > zones/nztest.com.nsd + sed -e '/DS\t44030/s/^/;/g' < zones/delegated.dnssec-parent.com > zones/delegated.dnssec-parent.com.nsd +} + +tonsd () +{ + cat > nsd.conf << __EOF__ +server: + ip-address: 127.0.0.1@$port + database: ./nsd.db + difffile: ./ixfr.db + xfrdfile: ./ixfr.state + + zonesdir: ./zones + username: "" + +key: + name: test + algorithm: $ALGORITHM + secret: "$KEY" +__EOF__ + + rm -f K* + rm -f zones/*.nsd + + nsdfix + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + + if [ -f zones/$zone.nsd ] + then + zonefile=zones/${zone}.nsd + else + zonefile=zones/${zone} + fi + + if [ "$1" != "unsigned" ] + then + if [ ! "${zone: 0:16}" = "secure-delegated" ] + then + ksk=$(ldns-keygen -r /dev/urandom -a RSASHA256 -k $zone) + else + ksk="secure-delegated.dnssec-parent.com" + fi + zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone) + fi + + case $1 in + nsec) + ldns-signzone -f zones/${zone}.signed ${zonefile} $ksk $zsk + ;; + nsec3) + ldns-signzone -n -a 1 -s abcd -t 1 -f zones/${zone}.signed ${zonefile} $ksk $zsk + ;; + nsec3-optout) + ldns-signzone -n -p -a 1 -s abcd -t 1 -f zones/${zone}.signed ${zonefile} $ksk $zsk + if [ "$zone" = "dnssec-parent.com" ] + then + echo "insecure.dnssec-parent.com. IN NS ns.insecure.dnssec-parent.com." >> zones/${zone}.signed + fi + ;; + unsigned) + cp ${zonefile} zones/${zone}.signed + ;; + *) + echo 'tonsd called with wrong param' + exit + esac + + echo "" >> nsd.conf + echo "zone:" >> nsd.conf + echo " name: \"${zone}\"" >> nsd.conf + echo " zonefile: \"${zone}.signed\"" >> nsd.conf + if [ "${zone}" = "tsig.com" ] + then + echo " provide-xfr: 0.0.0.0/0 test" >> nsd.conf + echo " provide-xfr: ::0/0 test" >> nsd.conf + else + echo " provide-xfr: 0.0.0.0/0 NOKEY" >> nsd.conf + echo " provide-xfr: ::0/0 NOKEY" >> nsd.conf + fi + done + nsdc -c nsd.conf rebuild +} + +case $context in + ext-nsd | ext-nsd-nsec | ext-nsd-nsec3 | ext-nsd-nsec3-optout) + case $context in + ext-nsd) + tonsd unsigned + extracontexts="extnsd" + skipreasons="nsd nodnssec nodyndns" + ;; + ext-nsd-nsec) + tonsd nsec + extracontexts="extnsd dnssec" + skipreasons="nsd nodyndns" + ;; + ext-nsd-nsec3) + tonsd nsec3 + extracontexts="extnsd dnssec nsec3" + skipreasons="nsd nsec3 nodyndns" + ;; + ext-nsd-nsec3-optout) + tonsd nsec3-optout + extracontexts="extnsd dnssec nsec3 nsec3-optout" + skipreasons="nsd optout nodyndns" + ;; + *) + nocontext=yes + esac + nsd -c nsd.conf -P ../pdns.pid -d & + sleep 5 + ;; + + *) + nocontext=yes +esac diff --git a/regression-tests/ext/nsd-slave b/regression-tests/ext/nsd-slave new file mode 100644 index 000000000..aa8b23739 --- /dev/null +++ b/regression-tests/ext/nsd-slave @@ -0,0 +1,47 @@ + skipreasons="$skipreasons nsd" + context=$context-presigned + cat > nsd-slave.conf << __EOF__ +server: + ip-address: 127.0.0.1@$((port+100)) + database: ./nsd-slave.db + difffile: ./ixfr-slave.db + xfrdfile: ./ixfr-slave.state + zonesdir: ./zones + username: "" + +key: + name: test + algorithm: $ALGORITHM + secret: "$KEY" +__EOF__ + + rm -f ixfr-slave.db + rm -f ixfr-slave.state + + for zone in $(grep 'zone ' named.conf | cut -f2 -d\") + do + rm -f zones/$zone-slave + + echo "" >> nsd-slave.conf + echo "zone:" >> nsd-slave.conf + echo " name: \"${zone}\"" >> nsd-slave.conf + echo " zonefile: \"${zone}-slave\"" >> nsd-slave.conf + if [ "${zone}" = "tsig.com" ] + then + echo " allow-notify: 127.0.0.1 test" >> nsd-slave.conf + echo " request-xfr: AXFR 127.0.0.1@$port test" >> nsd-slave.conf + echo " provide-xfr: 0.0.0.0/0 test" >> nsd-slave.conf + echo " provide-xfr: ::0/0 test" >> nsd-slave.conf + else + echo " allow-notify: 127.0.0.1 NOKEY" >> nsd-slave.conf + echo " request-xfr: AXFR 127.0.0.1@$port NOKEY" >> nsd-slave.conf + echo " provide-xfr: 0.0.0.0/0 NOKEY" >> nsd-slave.conf + echo " provide-xfr: ::0/0 NOKEY" >> nsd-slave.conf + fi + done + + port=$((port+100)) + nsdc -c nsd-slave.conf rebuild + + nsd -c nsd-slave.conf -P ../pdns-slave.pid -d & + sleep 20 diff --git a/regression-tests/named.conf b/regression-tests/named.conf index aecf40956..c1ca08490 100644 --- a/regression-tests/named.conf +++ b/regression-tests/named.conf @@ -1,5 +1,5 @@ options { - directory "./"; + directory "./zones/"; recursion no; listen-on port 5300 { 127.0.0.1; @@ -9,17 +9,17 @@ options { }; zone "example.com"{ type master; - file "./example.com"; + file "example.com"; }; zone "test.com"{ type master; - file "./test.com"; + file "test.com"; }; zone "test.dyndns" { type master; - file "./test.dyndns"; + file "test.dyndns"; allow-update { 127.0.0.0/8; }; @@ -27,40 +27,40 @@ zone "test.dyndns" { zone "wtest.com"{ type master; - file "./wtest.com"; + file "wtest.com"; }; zone "nztest.com"{ type master; - file "./nztest.com"; + file "nztest.com"; }; zone "dnssec-parent.com"{ type master; - file "./dnssec-parent.com"; + file "dnssec-parent.com"; }; zone "delegated.dnssec-parent.com"{ type master; - file "./delegated.dnssec-parent.com"; + file "delegated.dnssec-parent.com"; }; zone "secure-delegated.dnssec-parent.com"{ type master; - file "./secure-delegated.dnssec-parent.com"; + file "secure-delegated.dnssec-parent.com"; }; zone "minimal.com"{ type master; - file "./minimal.com"; + file "minimal.com"; }; zone "tsig.com"{ type master; - file "./tsig.com"; + file "tsig.com"; }; zone "stest.com"{ type master; - file "./stest.com"; + file "stest.com"; }; diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 20883702a..e98e86382 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -15,184 +15,6 @@ export KEY trap "kill_process 2" EXIT INT TERM -nsdfix () -{ - sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.nsd - sed '/EUI/s/^/;/g' < example.com > example.com.nsd - sed -e '/testnonzone\.com\./s/^/;/g' -e '/NZTEST\.COM\.NET\./s/^/;/g' < nztest.com > nztest.com.nsd -} - -bindfix () -{ - sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.bind - sed -e '/EUI/s/^/;/g' -e '/host\.\*\.sub/s/^/;/g' < example.com > example.com.bind -} - -tonsd () -{ - cat > nsd.conf << __EOF__ -server: - ip-address: 127.0.0.1@$port - database: ./nsd.db - difffile: ./ixfr.db - xfrdfile: ./ixfr.state - - zonesdir: . - username: "" - -key: - name: test - algorithm: $ALGORITHM - secret: "$KEY" -__EOF__ - - rm -f K* - rm -f *.nsd - - nsdfix - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - - if [ -f $zone.nsd ] - then - zonefile=${zone}.nsd - else - zonefile=${zone} - fi - - if [ "$1" != "unsigned" ] - then - if [ ! "${zone: 0:16}" = "secure-delegated" ] - then - ksk=$(ldns-keygen -r /dev/urandom -a RSASHA256 -k $zone) - else - ksk="secure-delegated.dnssec-parent.com" - fi - zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone) - fi - - case $1 in - nsec) - ldns-signzone -f ${zone}.signed ${zonefile} $ksk $zsk - ;; - nsec3) - ldns-signzone -n -a 1 -s abcd -t 1 -f ${zone}.signed ${zonefile} $ksk $zsk - ;; - nsec3-optout) - ldns-signzone -n -p -a 1 -s abcd -t 1 -f ${zone}.signed ${zonefile} $ksk $zsk - if [ "$zone" = "dnssec-parent.com" ] - then - echo "insecure.dnssec-parent.com. IN NS ns.insecure.dnssec-parent.com." >> ${zone}.signed - fi - ;; - unsigned) - cp ${zonefile} ${zone}.signed - ;; - *) - echo 'tonsd called with wrong param' - exit - esac - - echo "" >> nsd.conf - echo "zone:" >> nsd.conf - echo " name: \"${zone}\"" >> nsd.conf - echo " zonefile: \"${zone}.signed\"" >> nsd.conf - if [ "${zone}" = "tsig.com" ] - then - echo " provide-xfr: 0.0.0.0/0 test" >> nsd.conf - echo " provide-xfr: ::0/0 test" >> nsd.conf - else - echo " provide-xfr: 0.0.0.0/0 NOKEY" >> nsd.conf - echo " provide-xfr: ::0/0 NOKEY" >> nsd.conf - fi - done - nsdc -c nsd.conf rebuild -} - - - -tobind () -{ - cat > bind.conf << __EOF__ -options { - dnssec-enable yes; - listen-on port $port { 127.0.0.1; }; - minimal-responses yes; - pid-file "pdns.pid"; -}; - -key test { - algorithm $ALGORITHM; - secret "$KEY"; -}; -__EOF__ - - rm -f K* - rm -f *.bind - - bindfix - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - - if [ ! -f $zone.bind ] - then - cp $zone $zone.bind - fi - - if [ "$1" != "unsigned" ] - then - if [ ! "${zone: 0:16}" = "secure-delegated" ] - then - ksk=$(dnssec-keygen -r/dev/urandom -f KSK -a RSASHA256 -b 2048 -n ZONE $zone) - else - cp secure-delegated.dnssec-parent.com.private Ksecure-delegated.dnssec-parent.com.+008+54319.private - cp secure-delegated.dnssec-parent.com.key Ksecure-delegated.dnssec-parent.com.+008+54319.key - ksk="Ksecure-delegated.dnssec-parent.com.+008+54319" - fi - zsk=$(dnssec-keygen -r/dev/urandom -a RSASHA256 -b 1024 -n ZONE $zone) - - echo "\$include $ksk.key ; KSK" >> $zone.bind - echo "\$include $zsk.key ; ZSK" >> $zone.bind - fi - - case $1 in - nsec) - dnssec-signzone -o $zone -f $zone.signed $zone.bind - ;; - nsec3) - dnssec-signzone -3 abcd -H 1 -o $zone -f $zone.signed $zone.bind - ;; - nsec3-optout) - dnssec-signzone -3 abcd -H 1 -A -o $zone -f $zone.signed $zone.bind - if [ "$zone" = "dnssec-parent.com" ] - then - echo "insecure.dnssec-parent.com. IN NS ns.insecure.dnssec-parent.com." >> ${zone}.signed - fi - ;; - unsigned) - cp ${zone}.bind ${zone}.signed - ;; - *) - echo 'tobind called with wrong param' - exit - esac - - echo "" >> bind.conf - echo "zone \"${zone}\" {" >> bind.conf - echo " type master;" >> bind.conf - if [ "${zone}" = "tsig.com" ] - then - echo " allow-transfer { key test; none; };" >> bind.conf - fi - echo " file \"${zone}.signed\";" >> bind.conf - echo "};" >> bind.conf - done -} - - - tosql () { ${MAKE} -C ../pdns zone2sql > /dev/null @@ -327,7 +149,7 @@ cachettl=$4 [ -z "$cachettl" ] && cachettl=0 spectest=$5 -testsdir=. +testsdir=./tests if [ "$port" = help ] || [ "$context" = help ] then @@ -371,11 +193,11 @@ fi ${MAKE} -C ../pdns sdig nsec3dig || exit # Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well) -for zone in $(grep zone named.conf | cut -f2 -d\") +for zone in $(grep 'zone ' named.conf | cut -f2 -d\") do - if [ -f $zone.orig ] + if [ -f zones/$zone.orig ] then - cp -f $zone.orig $zone + cp -f zones/$zone.orig zones/$zone fi done @@ -421,691 +243,9 @@ else skiplua=1 fi -case $context in - ext-nsd | ext-nsd-nsec | ext-nsd-nsec3 | ext-nsd-nsec3-optout) - case $context in - ext-nsd) - tonsd unsigned - extracontexts="extnsd" - skipreasons="nsd nodnssec nodyndns" - ;; - ext-nsd-nsec) - tonsd nsec - extracontexts="extnsd dnssec" - skipreasons="nsd nodyndns" - ;; - ext-nsd-nsec3) - tonsd nsec3 - extracontexts="extnsd dnssec nsec3" - skipreasons="nsd nsec3 nodyndns" - ;; - ext-nsd-nsec3-optout) - tonsd nsec3-optout - extracontexts="extnsd dnssec nsec3 nsec3-optout" - skipreasons="nsd optout nodyndns" - ;; - esac - nsd -c nsd.conf -P pdns.pid -d & - sleep 5 - ;; - - ext-bind | ext-bind-nsec | ext-bind-nsec3 | ext-bind-nsec3-optout) - case $context in - ext-bind) - tobind unsigned - extracontexts="extbind" - skipreasons="bind nodnssec nodyndns" - ;; - ext-bind-nsec) - tobind nsec - extracontexts="extbind dnssec" - skipreasons="bind nodyndns" - ;; - ext-bind-nsec3) - tobind nsec3 - extracontexts="extbind dnssec nsec3" - skipreasons="bind nsec3 nodyndns" - ;; - ext-bind-nsec3-optout) - tobind nsec3-optout - extracontexts="extbind dnssec nsec3 nsec3-optout" - skipreasons="bind optout nodyndns" - ;; - esac - named -c bind.conf -g & - sleep 5 - ;; - - bind) - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=bind --bind-config=./named.conf \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config \ - --bind-ignore-broken-records=yes & - skipreasons="nodnssec nodyndns" - bindwait - ;; - - bind-dnssec | bind-dnssec-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow) - rm -f dnssec.sqlite3 - ../pdns/pdnssec --config-dir=. create-bind-db dnssec.sqlite3 - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - securezone $zone - if [ $context = bind-dnssec-nsec3 ] || [ $context = bind-dnssec-nsec3-optout ] - then - ../pdns/pdnssec --config-dir=. set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - elif [ $context = bind-dnssec-nsec3-narrow ] - then - ../pdns/pdnssec --config-dir=. set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 - fi - done - - if [ $context = bind-dnssec-nsec3 ] - then - extracontexts="bind dnssec nsec3" - skipreasons="nsec3 nodyndns" - elif [ $context = bind-dnssec-nsec3-optout ] - then - extracontexts="bind dnssec nsec3 nsec3-optout" - skipreasons="optout nodyndns" - elif [ $context = bind-dnssec-nsec3-narrow ] - then - extracontexts="bind dnssec narrow" - skipreasons="narrow nodyndns" - else - extracontexts="bind dnssec" - skipreasons="nodyndns" - fi - - ../pdns/pdnssec --config-dir=. import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. activate-tsig-key tsig.com test master - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=bind --bind-config=./named.conf \ - --bind-dnssec-db=./dnssec.sqlite3 \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ - --cache-ttl=$cachettl --no-config \ - --bind-ignore-broken-records=yes $lua_prequery & - bindwait - ;; - - gmysql-nodnssec) - [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest - [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root - [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost - [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' - - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql - - tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" - - cat > pdns-gmysql.conf << __EOF__ -launch=gmysql -gmysql-dbname=$GMYSQLDB -gmysql-user=$GMYSQLUSER -gmysql-host=$GMYSQLHOST -gmysql-password=$GMYSQLPASSWD -__EOF__ - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 - done - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gmysql \ - --master --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ - --cache-ttl=$cachettl --no-config \ - --gmysql-dbname="$GMYSQLDB" \ - --gmysql-user="$GMYSQLUSER" \ - --gmysql-host="$GMYSQLHOST" \ - --gmysql-password="$GMYSQLPASSWD" & - skipreasons=nodnssec - ;; - mydns) - [ -z "$MYDNSDB" ] && MYDNSDB=pdnstest - [ -z "$MYDNSUSER" ] && MYDNSUSER=root - [ -z "$MYDNSHOST" ] && MYDNSHOST=localhost - [ -z "$MYDNSPASSWD" ] && MYDNSPASSWD='' - - mysqladmin --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" --force drop "$MYDNSDB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" create "$MYDNSDB" - mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ - "$MYDNSDB" < ../modules/mydnsbackend/schema.sql - - tosql mydns | grep -v 'double\.example\.com' | mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ - "$MYDNSDB" - - cat > pdns-mydns.conf << __EOF__ -launch=mydns -mydns-dbname=$MYDNSDB -mydns-user=$MYDNSUSER -mydns-host=$MYDNSHOST -mydns-password=$MYDNSPASSWD -__EOF__ - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=mydns \ - --master --send-root-referral \ - --cache-ttl=0 --no-config \ - --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no \ - --mydns-dbname="$MYDNSDB" \ - --mydns-user="$MYDNSUSER" \ - --mydns-host="$MYDNSHOST" \ - --mydns-password="$MYDNSPASSWD" & - skipreasons="nodnssec noent nodyndns" - ;; - - gmysql | gmysql-nsec3 | gmysql-nsec3-optout |gmysql-nsec3-narrow) - [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest - [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root - [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost - [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' - - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql - - tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" - - cat > pdns-gmysql.conf << __EOF__ -launch=gmysql -gmysql-dbname=$GMYSQLDB -gmysql-user=$GMYSQLUSER -gmysql-host=$GMYSQLHOST -gmysql-password=$GMYSQLPASSWD -gmysql-dnssec -__EOF__ - for zone in $(grep zone named.conf | cut -f2 -d\") - do - securezone $zone gmysql - if [ $context = gmysql-nsec3 ] || [ $context = gmysql-nsec3-optout ] - then - ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 - elif [ $context = gmysql-nsec3-narrow ] - then - ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 - fi - - - done - - ../pdns/pdnssec --config-dir=. --config-name=gmysql import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gmysql activate-tsig-key tsig.com test master - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch --launch+=random --launch+=gmysql --launch+=random --gmysql-dnssec \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ - --cache-ttl=$cachettl --no-config \ - --gmysql-dbname="$GMYSQLDB" \ - --gmysql-user="$GMYSQLUSER" \ - --gmysql-host="$GMYSQLHOST" \ - --gmysql-password="$GMYSQLPASSWD" $lua_prequery & - if [ $context = gmysql-nsec3 ] - then - extracontexts="dnssec nsec3" - skipreasons="nsec3" - elif [ $context = gmysql-nsec3-optout ] - then - extracontexts="dnssec nsec3 nsec3-optout" - skipreasons="optout" - elif [ $context = gmysql-nsec3-narrow ] - then - extracontexts="dnssec narrow" - skipreasons="narrow" - else - extracontexts="dnssec" - fi - - ;; - gpgsql | gpgsql-nsec3 | gpgsql-nsec3-optout) - [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest - [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) - - dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring dropdb failure - createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring createdb failure # FIXME - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/dnssec.schema.pgsql.sql - - tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c - - cat > pdns-gpgsql.conf << __EOF__ -launch=gpgsql -gpgsql-dbname=$GPGSQLDB -gpgsql-user=$GPGSQLUSER -gpgsql-dnssec -__EOF__ - for zone in $(grep zone named.conf | cut -f2 -d\") - do - securezone $zone gpgsql - if [ $context = gpgsql-nsec3 ] || [ $context = gpgsql-nsec3-optout ] - then - ../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 - fi - done - - ../pdns/pdnssec --config-dir=. --config-name=gpgsql import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gpgsql activate-tsig-key tsig.com test master - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gpgsql --gpgsql-dnssec \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config \ - --gpgsql-dbname="$GPGSQLDB" \ - --gpgsql-user="$GPGSQLUSER" $lua_prequery & - if [ $context = gpgsql-nsec3 ] - then - extracontexts="dnssec nsec3" - elif [ $context = gpgsql-nsec3-optout ] - then - extracontexts="dnssec nsec3 nsec3-optout" - elif [ $context = gpgsql-nsec3-narrow ] - then - extracontexts="dnssec narrow" - else - extracontexts="dnssec" - fi - skipreasons="nodyndns" - - ;; - gpgsql-nodnssec) - [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest - [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) - - dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure - createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql - - tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c - - cat > pdns-gpgsql.conf << __EOF__ -launch=gpgsql -gpgsql-dbname=$GPGSQLDB -gpgsql-user=$GPGSQLUSER -__EOF__ - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 - done - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gpgsql \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config \ - --gpgsql-dbname="$GPGSQLDB" \ - --gpgsql-user="$GPGSQLUSER" & - skipreasons="nodnssec nodyndns" - ;; - - - gsqlite3-nodnssec) - rm -f pdns.sqlite3 - sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql - tosql gsqlite | sqlite3 pdns.sqlite3 - echo ANALYZE\; | sqlite3 pdns.sqlite3 - - cat > pdns-gsqlite3.conf << __EOF__ -launch=gsqlite3 -gsqlite3-database=pdns.sqlite3 -__EOF__ - for zone in $(grep zone named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 - done - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config \ - --gsqlite3-database=pdns.sqlite3 & - skipreasons="nodnssec nodyndns" - - ;; - opendbx-sqlite3) - rm -f pdns-opendbx.sqlite3 - sqlite3 pdns-opendbx.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql - tosql gsqlite | sqlite3 pdns-opendbx.sqlite3 - sqlite3 pdns-opendbx.sqlite3 "ALTER TABLE domains ADD status CHARACTER(1) NOT NULL DEFAULT 'A'; \ - ALTER TABLE domains ADD auto_serial INTEGER DEFAULT 0;" - echo ANALYZE\; | sqlite3 pdns-opendbx.sqlite3 - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=opendbx \ - --send-root-referral \ - --cache-ttl=$cachettl --no-config \ - --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \ - --opendbx-database=pdns-opendbx.sqlite3 & - skipreasons="nodnssec noent nodyndns" - - ;; - gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout) - rm -f pdns.sqlite3 - sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql - sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql - tosql gsqlite | sqlite3 pdns.sqlite3 - echo ANALYZE\; | sqlite3 pdns.sqlite3 - - cat > pdns-gsqlite3.conf << __EOF__ -launch=gsqlite3 -gsqlite3-database=pdns.sqlite3 -gsqlite3-dnssec -__EOF__ - for zone in $(grep zone named.conf | cut -f2 -d\") - do - securezone $zone gsqlite3 - if [ $context = gsqlite3-nsec3 ] || [ $context = gsqlite3-nsec3-optout ] - then - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 - fi - done - - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 activate-tsig-key tsig.com test master - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config \ - --gsqlite3-database=pdns.sqlite3 $lua_prequery & - if [ $context = gsqlite3-nsec3 ] - then - extracontexts="dnssec nsec3" - elif [ $context = gsqlite3-nsec3-optout ] - then - extracontexts="dnssec nsec3 nsec3-optout" - else - extracontexts="dnssec" - fi - skipreasons="nodyndns" - ;; - - - goracle-nodnssec | goracle | goracle-nsec3 | goracle-nsec3-optout) - [ -z "$GORACLEUSER" ] && GORACLEUSER=pdns - [ -z "$GORACLEPASSWD" ] && GORACLEPASSWD=pdns - - echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe > goracle.log - echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log - tosql goracle | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log +source backends/common - cat > pdns-goracle.conf << __EOF__ -launch=goracle -goracle-home=$ORACLE_HOME -goracle-sid=$ORACLE_SID -goracle-nls-lang=$NLS_LANG - -goracle-tnsname=xe -goracle-user=$GORACLEUSER -goracle-password=$GORACLEPASSWD -__EOF__ - - if [ $context != goracle-nodnssec ] - then - echo "goracle-dnssec" >> pdns-goracle.conf - ../pdns/pdnssec --config-dir=. --config-name=goracle import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=goracle activate-tsig-key tsig.com test master - fi - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - if [ $context != goracle-nodnssec ] - then - securezone $zone goracle - if [ $context = goracle-nsec3 ] || [ $context = goracle-nsec3-optout ] - then - ../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 - fi - else - ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 - fi - done - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ - --config-name=goracle --socket-dir=./ --no-shuffle \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl $lua_prequery & - - skipreasons="nodyndns" - if [ $context = goracle-nsec3 ] - then - extracontexts="dnssec nsec3" - elif [ $context = goracle-nsec3-optout ] - then - extracontexts="dnssec nsec3 nsec3-optout" - elif [ $context = goracle-nodnssec ] - then - skipreasons="nodnssec nodyndns" - else - extracontexts="dnssec" - fi - ;; - - - oracle-nodnssec | oracle | oracle-nsec3) - [ -z "$ORACLEUSER" ] && ORACLEUSER=pdns - [ -z "$ORACLEPASSWD" ] && ORACLEPASSWD=pdns - - echo "START ../modules/oraclebackend/dropschema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe > oracle.log - echo "START ../modules/oraclebackend/schema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log - ../pdns/zone2sql --oracle | grep -v 'INSERT INTO Records' | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log - ../pdns/zone2sql --oracle | grep " 'SOA', " | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log - - cat > pdns-oracle.conf << __EOF__ -launch=oracle -oracle-home=$ORACLE_HOME -oracle-sid=$ORACLE_SID -oracle-nls-lang=$NLS_LANG - -oracle-pool-database=xe -oracle-pool-username=$ORACLEUSER -oracle-pool-password=$ORACLEPASSWD -oracle-master-database=xe -oracle-master-username=$ORACLEUSER -oracle-master-password=$ORACLEPASSWD -__EOF__ - - if [ $context != oracle-nodnssec ] - then - echo "oracle-dnssec" >> pdns-oracle.conf - ../pdns/pdnssec --config-dir=. --config-name=oracle import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=oracle activate-tsig-key tsig.com test master - fi - - if [ $context != oracle-nodnssec ] - then - for zone in $(grep zone named.conf | cut -f2 -d\") - do - securezone $zone oracle - if [ $context = oracle-nsec3 ] - then - ../pdns/pdnssec --config-dir=. --config-name=oracle set-nsec3 $zone "1 0 1 abcd" 2>&1 - fi - done - fi - - echo "TRUNCATE TABLE records;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log - ../pdns/zone2sql --oracle | grep -v 'INSERT INTO Zones' | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ - --config-name=oracle --socket-dir=./ --no-shuffle \ - --send-root-referral --query-logging \ - --cache-ttl=$cachettl $lua_prequery & - - if [ $context = oracle-nsec3 ] - then - skipreasons="nodyndns oracle-nsec3" - extracontexts="dnssec nsec3" - elif [ $context = oracle-nodnssec ] - then - skipreasons="nodyndns nodnssec" - else - skipreasons="nodyndns oracle-nsec" - extracontexts="dnssec" - fi - skipreasons="$skipreasons noent" # TODO add ent support to oracle backend - ;; - - - tinydns) - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=tinydns \ - --cache-ttl=$cachettl --no-config \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --tinydns-dbfile=../modules/tinydnsbackend/data.cdb & - skipreasons="nodnssec noent nodyndns" - ;; - remotebackend-*) - remotetype=$(echo $context | cut -d- -f 2) - remotesec=$(echo $context | cut -d- -f 3) - narrow=$(echo $context | cut -d- -f 4) - testsdir=../modules/remotebackend/regression-tests/ - - # cleanup unbound-host.conf to avoid failures - rm -f unbound-host.conf - - echo "Setting up test database..." - # setup test database - rm -f $testsdir/remote.sqlite3 - sqlite3 $testsdir/remote.sqlite3 < $testsdir/test-schema.sql - chmod 0666 $testsdir/remote.sqlite3 - - case $remotetype in - http) - connstr="http:url=http://localhost:62434/dns" - rm -f remotebackend-server.log - rm -f remotebackend-access.log - $testsdir/http-backend.rb & - echo $! > pdns-remotebackend.pid - set +e - # make sure it runs before continuing - loopcount=0 - while [ $loopcount -lt 20 ]; do - res=$(curl http://localhost:62434/ping 2>/dev/null) - if [ "x$res" == "xpong" ] - then - break - fi - sleep 1 - let loopcount=loopcount+1 - done - set -e - ;; - zeromq) - connstr="zeromq:endpoint=ipc:///tmp/pdns.0" - $testsdir/zeromq-backend.rb & - echo $! > pdns-remotebackend.pid - ;; - unix) - connstr="unix:path=/tmp/remote.socket" - socat unix-listen:/tmp/remote.socket,fork exec:$testsdir/unix-backend.rb & - echo $! > pdns-remotebackend.pid - ;; - pipe) - connstr="pipe:command=$testsdir/pipe-backend.rb" - ;; - *) - echo "Invalid usage" - exit - ;; - esac - - skipreasons="nodnssec nodyndns" - - if [ "$remotesec" = "nsec3" ] - then - remotedosec="yes" - if [ "$narrow" = "narrow" ] - then - extracontexts="dnssec nsec3 narrow" - skipreasons="narrow nsec3 nodyndns" - else - extracontexts="dnssec nsec3" - skipreasons="nsec3 nodyndns" - fi - - remote_add_param="--remote-dnssec=yes" - elif [ "$remotesec" = "dnssec" ] - then - remotedosec="yes" - remote_add_param="--remote-dnssec=yes" - extracontexts="dnssec" - skipreasons="nonsec3 nonarrow nodyndns" - fi - - - # generate pdns.conf for pdnssec - cat > pdns-remote.conf <> pdns-remote.conf - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.ksk ksk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.1 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key example.com $testsdir/example.com.zsk.2 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 1 - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 2 - ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 3 - - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.ksk ksk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.1 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote import-zone-key up.example.com $testsdir/up.example.com.zsk.2 zsk - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 4 - ../pdns/pdnssec --config-dir=. --config-name=remote activate-zone-key example.com 5 - ../pdns/pdnssec --config-dir=. --config-name=remote deactivate-zone-key example.com 6 - - if [ "$remotesec" = "nsec3" ] - then - ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 example.com - ../pdns/pdnssec --config-dir=. --config-name=remote set-nsec3 up.example.com - fi - fi - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=remote \ - --query-logging --loglevel=9 --cache-ttl=$cachettl --no-config \ - --send-root-referral --distributor-threads=1 \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --remote-connection-string="$connstr" $remote_add_param & - - ;; - *) - echo unknown context $context - : > passed_tests - echo 'unknown-context-'"$context" > failed_tests - ./toxml $context - exit -esac +start_master if [ "$skiplua" == "1" ]; then skipreasons="$skipreasons nolua" @@ -1113,324 +253,6 @@ fi check_process -startslave () -{ - skipreasons="$skipreasons presigned nodyndns" - if [ ${presignedcontext:0:6} = gmysql ] - then - context=${context}-presigned - [ -z "$GMYSQL2DB" ] && GMYSQL2DB=pdnstest2 - [ -z "$GMYSQL2USER" ] && GMYSQL2USER=root - [ -z "$GMYSQL2HOST" ] && GMYSQL2HOST=localhost - [ -z "$GMYSQL2PASSWD" ] && GMYSQL2PASSWD='' - - mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" --force drop "$GMYSQL2DB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" create "$GMYSQL2DB" - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql - - for zone in $(grep zone named.conf | cut -f2 -d\" | tac) - do - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" \ - -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" - done - - set +e - echo $skipreasons | grep -q nodnssec - if [ $? -ne 0 ]; then - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO tsigkeys (name, algorithm,secret) VALUES('test', '$ALGORITHM', '$KEY')" - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ]; then - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" - fi - fi - set -e - - port=$((port+100)) - - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gmysql --gmysql-dnssec \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --query-cache-ttl=$cachettl --no-config --slave --retrieval-threads=4 \ - --gmysql-dbname="$GMYSQL2DB" \ - --gmysql-user="$GMYSQL2USER" \ - --gmysql-host="$GMYSQL2HOST" \ - --gmysql-password="$GMYSQL2PASSWD" \ - --config-name=gmysql2 |& egrep -v "update records set ordername|insert into records" & - echo 'waiting for zones to be slaved' - loopcount=0 - while [ $loopcount -lt 20 ] - do - sleep 5 - todo=$(mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQl2HOST" \ - "$GMYSQL2DB" -ss -e 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') - if [ $todo = 0 ] - then - break - fi - let loopcount=loopcount+1 - done - if [ $todo -ne 0 ]; then - echo "AXFR FAILED" >> failed_tests - fi - elif [ ${presignedcontext:0:8} = gsqlite3 ] - then - context=${context}-presigned - rm -f pdns.sqlite31 - sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql - sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql - - for zone in $(grep zone named.conf | cut -f2 -d\" | tac) - do - sqlite3 pdns.sqlite31 "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port');" - done - - set +e - echo $skipreasons | grep -q nodnssec - if [ $? -ne 0 ]; then - sqlite3 pdns.sqlite31 "INSERT INTO tsigkeys (name,algorithm,secret) VALUES('test','$ALGORITHM', '$KEY')" - sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ]; then - sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" - fi - fi - set -e - - port=$((port+100)) - - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ - --fancy-records --send-root-referral \ - --cache-ttl=0 --query-cache-ttl=0 --no-config --slave --retrieval-threads=4 \ - --gsqlite3-database=pdns.sqlite31 --gsqlite3-pragma-synchronous=0 \ - --config-name=gsqlite32 |& egrep -v "update records set ordername|insert into records" & - echo 'waiting for zones to be slaved' - set +e - loopcount=0 - while [ $loopcount -lt 20 ] - do - sleep 5 - todo=$(sqlite3 pdns.sqlite31 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') - if [ $todo -eq 0 ] - then - if [ $todo = 0 ] - then - break - fi - fi - let loopcount=loopcount+1 - done - if [ $todo -ne 0 ]; then - echo "AXFR FAILED" >> failed_tests - fi - set -e - sqlite3 pdns.sqlite31 ANALYZE; - elif [ ${presignedcontext:0:7} = goracle ] - then - context=${context}-presigned - [ -z "$GORACLE2USER" ] && GORACLE2USER=pdns2 - [ -z "$GORACLE2PASSWD" ] && GORACLE2PASSWD=pdns - - echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe > goracle2.log - echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log - - cat > pdns-goracle2.conf << __EOF__ -launch=goracle -goracle-home=$ORACLE_HOME -goracle-sid=$ORACLE_SID -goracle-nls-lang=$NLS_LANG - -goracle-tnsname=xe -goracle-user=$GORACLE2USER -goracle-password=$GORACLE2PASSWD -goracle-dnssec -__EOF__ - - for zone in $(grep zone named.conf | cut -f2 -d\" | tac) - do - echo "INSERT INTO domains (id, name, type, master) VALUES(domains_id_sequence.nextval, '$zone', 'SLAVE', '127.0.0.1:$port');" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log - done - - set +e - echo $skipreasons | grep -q nodnssec - if [ $? -ne 0 ]; then - ../pdns/pdnssec --config-dir=. --config-name=goracle2 import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=goracle2 activate-tsig-key tsig.com test master - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ]; then - ../pdns/pdnssec --config-dir=. --config-name=goracle2 set-meta stest.com AXFR-SOURCE 127.0.0.2 - fi - fi - set -e - - port=$((port+100)) - - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \ - --config-name=goracle2 --socket-dir=./ --no-shuffle \ - --send-root-referral --slave --retrieval-threads=4 \ - --slave-cycle-interval=300 --config-name=goracle2 & - echo 'waiting for zones to be slaved' - - loopcount=0 - while [ $loopcount -lt 40 ] - do - sleep 5 - todo=$(sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe << __EOF__ -set pagesize 0 feedback off verify off heading off echo off; -SELECT COUNT(id) FROM domains WHERE last_check IS NULL; -exit; -__EOF__ -) - if [ $todo = 0 ] - then - break - fi - let loopcount=loopcount+1 - done - if [ $todo -ne 0 ]; then - echo "AXFR FAILED" >> failed_tests - fi - - elif [ ${presignedcontext:0:4} = bind ] - then - context=${context}-presigned - sed -e 's/type master;/type slave;\n\tmasters { 127.0.0.1:'$port'; };/' -e 's/file "\([^"]\+\)/file "\1-slave/' < named.conf > named-slave.conf - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - rm -rf $zone-slave - done - - rm -f dnssec-slave.sqlite3 - - ../pdns/pdnssec --config-dir=. create-bind-db dnssec-slave.sqlite3 - - set +e - echo $skipreasons | grep -q nodnssec - if [ $? -ne 0 ]; then - sqlite3 dnssec-slave.sqlite3 "INSERT INTO tsigkeys (name, algorithm,secret) VALUES('test', '$ALGORITHM', '$KEY')" - sqlite3 dnssec-slave.sqlite3 "INSERT INTO domainmetadata (domain, kind, content) SELECT 'tsig.com', 'AXFR-MASTER-TSIG', 'test'" - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ]; then - sqlite3 dnssec-slave.sqlite3 "INSERT INTO domainmetadata (domain,kind,content) SELECT 'stest.com','AXFR-SOURCE','127.0.0.2'" - fi - fi - set -e - - port=$((port+100)) - - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=bind --bind-config=./named-slave.conf --slave \ - --send-root-referral --retrieval-threads=1 --config-name=bind-slave \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 & - echo 'waiting for zones to be loaded' - bindwait bind-slave - elif [ ${presignedcontext:0:7} = ext-nsd ] - then - skipreasons="$skipreasons nsd" - context=$context-presigned - cat > nsd-slave.conf << __EOF__ -server: - ip-address: 127.0.0.1@$((port+100)) - database: ./nsd-slave.db - difffile: ./ixfr-slave.db - xfrdfile: ./ixfr-slave.state - zonesdir: . - username: "" - -key: - name: test - algorithm: $ALGORITHM - secret: "$KEY" -__EOF__ - - rm -f ixfr-slave.db - rm -f ixfr-slave.state - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - rm -f $zone-slave - - echo "" >> nsd-slave.conf - echo "zone:" >> nsd-slave.conf - echo " name: \"${zone}\"" >> nsd-slave.conf - echo " zonefile: \"${zone}-slave\"" >> nsd-slave.conf - if [ "${zone}" = "tsig.com" ] - then - echo " allow-notify: 127.0.0.1 test" >> nsd-slave.conf - echo " request-xfr: AXFR 127.0.0.1@$port test" >> nsd-slave.conf - echo " provide-xfr: 0.0.0.0/0 test" >> nsd-slave.conf - echo " provide-xfr: ::0/0 test" >> nsd-slave.conf - else - echo " allow-notify: 127.0.0.1 NOKEY" >> nsd-slave.conf - echo " request-xfr: AXFR 127.0.0.1@$port NOKEY" >> nsd-slave.conf - echo " provide-xfr: 0.0.0.0/0 NOKEY" >> nsd-slave.conf - echo " provide-xfr: ::0/0 NOKEY" >> nsd-slave.conf - fi - done - - port=$((port+100)) - nsdc -c nsd-slave.conf rebuild - - nsd -c nsd-slave.conf -P pdns-slave.pid -d & - sleep 20 - elif [ ${presignedcontext:0:8} = ext-bind ] - then - skipreasons="$skipreasons bind" - context=$context-presigned - cat > bind-slave.conf << __EOF__ -options { - dnssec-enable yes; - listen-on port $(($port+100)) { 127.0.0.1; }; - minimal-responses yes; - pid-file "pdns-slave.pid"; -}; - -key test { - algorithm $ALGORITHM; - secret "$KEY"; -}; -__EOF__ - - rm -f ixfr-slave.db - rm -f ixfr-slave.state - - for zone in $(grep zone named.conf | cut -f2 -d\") - do - rm -f $zone-slave - - echo "" >> bind-slave.conf - echo "zone \"${zone}\" {" >> bind-slave.conf - echo " type slave;" >> bind-slave.conf - echo " file \"${zone}-slave\";" >> bind-slave.conf - if [ "${zone}" = "tsig.com" ] - then - echo " masters port $port { 127.0.0.1 key test; };" >> bind-slave.conf - echo " allow-transfer { key test; none; };" >> bind-slave.conf - else - echo " masters port $port { 127.0.0.1; };" >> bind-slave.conf - fi - echo "};" >> bind-slave.conf - done - - port=$((port+100)) - - named -c bind-slave.conf -g & - sleep 20 - fi -} - dotests () { nameserver=127.0.0.1 ./runtests $spectest ./toxml @@ -1450,7 +272,6 @@ dotests () { fi } -## TODO: give pdns a few seconds to startup or fail, then check if it did not fail ## TODO: give sdig a timeout RETVAL=0 @@ -1471,7 +292,7 @@ fi if [ $presigned = yes ] || [ $both = yes ] then - startslave + start_slave export port export context diff --git a/regression-tests/tests/.gitignore b/regression-tests/tests/.gitignore new file mode 100644 index 000000000..0bb54176b --- /dev/null +++ b/regression-tests/tests/.gitignore @@ -0,0 +1,5 @@ +diff +real_result +*.out +start +step.* diff --git a/regression-tests/00dnssec-grabkeys/command b/regression-tests/tests/00dnssec-grabkeys/command similarity index 92% rename from regression-tests/00dnssec-grabkeys/command rename to regression-tests/tests/00dnssec-grabkeys/command index 304d49042..4f363a2d6 100755 --- a/regression-tests/00dnssec-grabkeys/command +++ b/regression-tests/tests/00dnssec-grabkeys/command @@ -2,7 +2,7 @@ rm -f trustedkeys rm -f unbound-host.conf -for zone in $(grep zone named.conf | cut -f2 -d\") +for zone in $(grep 'zone ' named.conf | cut -f2 -d\") do if [ "${zone: 0:16}" != "secure-delegated" ] then diff --git a/regression-tests/00dnssec-grabkeys/description b/regression-tests/tests/00dnssec-grabkeys/description similarity index 100% rename from regression-tests/00dnssec-grabkeys/description rename to regression-tests/tests/00dnssec-grabkeys/description diff --git a/regression-tests/00dnssec-grabkeys/expected_result b/regression-tests/tests/00dnssec-grabkeys/expected_result similarity index 100% rename from regression-tests/00dnssec-grabkeys/expected_result rename to regression-tests/tests/00dnssec-grabkeys/expected_result diff --git a/regression-tests/0dyndns-prereq-all/command b/regression-tests/tests/0dyndns-prereq-all/command similarity index 100% rename from regression-tests/0dyndns-prereq-all/command rename to regression-tests/tests/0dyndns-prereq-all/command diff --git a/regression-tests/0dyndns-prereq-all/description b/regression-tests/tests/0dyndns-prereq-all/description similarity index 100% rename from regression-tests/0dyndns-prereq-all/description rename to regression-tests/tests/0dyndns-prereq-all/description diff --git a/regression-tests/0dyndns-prereq-all/expected_result b/regression-tests/tests/0dyndns-prereq-all/expected_result similarity index 100% rename from regression-tests/0dyndns-prereq-all/expected_result rename to regression-tests/tests/0dyndns-prereq-all/expected_result diff --git a/regression-tests/0dyndns-prereq-all/skip.nodyndns b/regression-tests/tests/0dyndns-prereq-all/skip.nodyndns similarity index 100% rename from regression-tests/0dyndns-prereq-all/skip.nodyndns rename to regression-tests/tests/0dyndns-prereq-all/skip.nodyndns diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/command b/regression-tests/tests/0dyndns-prereq-nxrrset-full/command similarity index 100% rename from regression-tests/0dyndns-prereq-nxrrset-full/command rename to regression-tests/tests/0dyndns-prereq-nxrrset-full/command diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/description b/regression-tests/tests/0dyndns-prereq-nxrrset-full/description similarity index 100% rename from regression-tests/0dyndns-prereq-nxrrset-full/description rename to regression-tests/tests/0dyndns-prereq-nxrrset-full/description diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/expected_result b/regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result similarity index 100% rename from regression-tests/0dyndns-prereq-nxrrset-full/expected_result rename to regression-tests/tests/0dyndns-prereq-nxrrset-full/expected_result diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/skip.nodyndns b/regression-tests/tests/0dyndns-prereq-nxrrset-full/skip.nodyndns similarity index 100% rename from regression-tests/0dyndns-prereq-nxrrset-full/skip.nodyndns rename to regression-tests/tests/0dyndns-prereq-nxrrset-full/skip.nodyndns diff --git a/regression-tests/1dyndns-big-package/command b/regression-tests/tests/1dyndns-big-package/command similarity index 100% rename from regression-tests/1dyndns-big-package/command rename to regression-tests/tests/1dyndns-big-package/command diff --git a/regression-tests/1dyndns-big-package/description b/regression-tests/tests/1dyndns-big-package/description similarity index 100% rename from regression-tests/1dyndns-big-package/description rename to regression-tests/tests/1dyndns-big-package/description diff --git a/regression-tests/1dyndns-big-package/expected_result b/regression-tests/tests/1dyndns-big-package/expected_result similarity index 100% rename from regression-tests/1dyndns-big-package/expected_result rename to regression-tests/tests/1dyndns-big-package/expected_result diff --git a/regression-tests/1dyndns-big-package/expected_result.dnssec b/regression-tests/tests/1dyndns-big-package/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-big-package/expected_result.dnssec rename to regression-tests/tests/1dyndns-big-package/expected_result.dnssec diff --git a/regression-tests/1dyndns-big-package/expected_result.narrow b/regression-tests/tests/1dyndns-big-package/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-big-package/expected_result.narrow rename to regression-tests/tests/1dyndns-big-package/expected_result.narrow diff --git a/regression-tests/1dyndns-big-package/expected_result.nsec3 b/regression-tests/tests/1dyndns-big-package/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-big-package/expected_result.nsec3 rename to regression-tests/tests/1dyndns-big-package/expected_result.nsec3 diff --git a/regression-tests/1dyndns-big-package/skip.nodyndns b/regression-tests/tests/1dyndns-big-package/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-big-package/skip.nodyndns rename to regression-tests/tests/1dyndns-big-package/skip.nodyndns diff --git a/regression-tests/1dyndns-check-soa-update/command b/regression-tests/tests/1dyndns-check-soa-update/command similarity index 100% rename from regression-tests/1dyndns-check-soa-update/command rename to regression-tests/tests/1dyndns-check-soa-update/command diff --git a/regression-tests/1dyndns-check-soa-update/description b/regression-tests/tests/1dyndns-check-soa-update/description similarity index 100% rename from regression-tests/1dyndns-check-soa-update/description rename to regression-tests/tests/1dyndns-check-soa-update/description diff --git a/regression-tests/1dyndns-check-soa-update/expected_result b/regression-tests/tests/1dyndns-check-soa-update/expected_result similarity index 100% rename from regression-tests/1dyndns-check-soa-update/expected_result rename to regression-tests/tests/1dyndns-check-soa-update/expected_result diff --git a/regression-tests/1dyndns-check-soa-update/skip.nodyndns b/regression-tests/tests/1dyndns-check-soa-update/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-check-soa-update/skip.nodyndns rename to regression-tests/tests/1dyndns-check-soa-update/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete-casesensative/command b/regression-tests/tests/1dyndns-update-add-delete-casesensative/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete-casesensative/command rename to regression-tests/tests/1dyndns-update-add-delete-casesensative/command diff --git a/regression-tests/1dyndns-update-add-delete-casesensative/description b/regression-tests/tests/1dyndns-update-add-delete-casesensative/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete-casesensative/description rename to regression-tests/tests/1dyndns-update-add-delete-casesensative/description diff --git a/regression-tests/1dyndns-update-add-delete-casesensative/expected_result b/regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete-casesensative/expected_result rename to regression-tests/tests/1dyndns-update-add-delete-casesensative/expected_result diff --git a/regression-tests/1dyndns-update-add-delete-casesensative/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete-casesensative/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete-casesensative/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete-casesensative/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete-cname/command b/regression-tests/tests/1dyndns-update-add-delete-cname/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete-cname/command rename to regression-tests/tests/1dyndns-update-add-delete-cname/command diff --git a/regression-tests/1dyndns-update-add-delete-cname/description b/regression-tests/tests/1dyndns-update-add-delete-cname/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete-cname/description rename to regression-tests/tests/1dyndns-update-add-delete-cname/description diff --git a/regression-tests/1dyndns-update-add-delete-cname/expected_result b/regression-tests/tests/1dyndns-update-add-delete-cname/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete-cname/expected_result rename to regression-tests/tests/1dyndns-update-add-delete-cname/expected_result diff --git a/regression-tests/1dyndns-update-add-delete-cname/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete-cname/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete-cname/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete-cname/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete-ds/command b/regression-tests/tests/1dyndns-update-add-delete-ds/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/command rename to regression-tests/tests/1dyndns-update-add-delete-ds/command diff --git a/regression-tests/1dyndns-update-add-delete-ds/description b/regression-tests/tests/1dyndns-update-add-delete-ds/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/description rename to regression-tests/tests/1dyndns-update-add-delete-ds/description diff --git a/regression-tests/1dyndns-update-add-delete-ds/expected_result b/regression-tests/tests/1dyndns-update-add-delete-ds/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/expected_result rename to regression-tests/tests/1dyndns-update-add-delete-ds/expected_result diff --git a/regression-tests/1dyndns-update-add-delete-ds/expected_result.dnssec b/regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-add-delete-ds/expected_result.narrow b/regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/expected_result.narrow rename to regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.narrow diff --git a/regression-tests/1dyndns-update-add-delete-ds/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-add-delete-ds/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.nsec3-optout similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/expected_result.nsec3-optout rename to regression-tests/tests/1dyndns-update-add-delete-ds/expected_result.nsec3-optout diff --git a/regression-tests/1dyndns-update-add-delete-ds/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete-ds/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete-ds/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete-ds/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete-mx/command b/regression-tests/tests/1dyndns-update-add-delete-mx/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete-mx/command rename to regression-tests/tests/1dyndns-update-add-delete-mx/command diff --git a/regression-tests/1dyndns-update-add-delete-mx/description b/regression-tests/tests/1dyndns-update-add-delete-mx/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete-mx/description rename to regression-tests/tests/1dyndns-update-add-delete-mx/description diff --git a/regression-tests/1dyndns-update-add-delete-mx/expected_result b/regression-tests/tests/1dyndns-update-add-delete-mx/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete-mx/expected_result rename to regression-tests/tests/1dyndns-update-add-delete-mx/expected_result diff --git a/regression-tests/1dyndns-update-add-delete-mx/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete-mx/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete-mx/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete-mx/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/command b/regression-tests/tests/1dyndns-update-add-delete-wildcard/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete-wildcard/command rename to regression-tests/tests/1dyndns-update-add-delete-wildcard/command diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/description b/regression-tests/tests/1dyndns-update-add-delete-wildcard/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete-wildcard/description rename to regression-tests/tests/1dyndns-update-add-delete-wildcard/description diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/expected_result b/regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete-wildcard/expected_result rename to regression-tests/tests/1dyndns-update-add-delete-wildcard/expected_result diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete-wildcard/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete-wildcard/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete-wildcard/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-delete/command b/regression-tests/tests/1dyndns-update-add-delete/command similarity index 100% rename from regression-tests/1dyndns-update-add-delete/command rename to regression-tests/tests/1dyndns-update-add-delete/command diff --git a/regression-tests/1dyndns-update-add-delete/description b/regression-tests/tests/1dyndns-update-add-delete/description similarity index 100% rename from regression-tests/1dyndns-update-add-delete/description rename to regression-tests/tests/1dyndns-update-add-delete/description diff --git a/regression-tests/1dyndns-update-add-delete/expected_result b/regression-tests/tests/1dyndns-update-add-delete/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-delete/expected_result rename to regression-tests/tests/1dyndns-update-add-delete/expected_result diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.dnssec b/regression-tests/tests/1dyndns-update-add-delete/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-add-delete/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-add-delete/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.narrow b/regression-tests/tests/1dyndns-update-add-delete/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-add-delete/expected_result.narrow rename to regression-tests/tests/1dyndns-update-add-delete/expected_result.narrow diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-add-delete/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-add-delete/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-add-delete/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-add-delete/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-delete/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-delete/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-delete/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-invalid-record/command b/regression-tests/tests/1dyndns-update-add-invalid-record/command similarity index 70% rename from regression-tests/1dyndns-update-add-invalid-record/command rename to regression-tests/tests/1dyndns-update-add-invalid-record/command index ce43cffba..3bf0879c5 100755 --- a/regression-tests/1dyndns-update-add-invalid-record/command +++ b/regression-tests/tests/1dyndns-update-add-invalid-record/command @@ -1,4 +1,4 @@ #!/bin/sh cleandig host-invalid.test.dyndns ANY hidesoadetails -$testname/sendupdate.pl $nameserver $port +tests/$testname/sendupdate.pl $nameserver $port cleandig host-invalid.test.dyndns ANY hidesoadetails diff --git a/regression-tests/1dyndns-update-add-invalid-record/description b/regression-tests/tests/1dyndns-update-add-invalid-record/description similarity index 100% rename from regression-tests/1dyndns-update-add-invalid-record/description rename to regression-tests/tests/1dyndns-update-add-invalid-record/description diff --git a/regression-tests/1dyndns-update-add-invalid-record/expected_result b/regression-tests/tests/1dyndns-update-add-invalid-record/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-invalid-record/expected_result rename to regression-tests/tests/1dyndns-update-add-invalid-record/expected_result diff --git a/regression-tests/1dyndns-update-add-invalid-record/sendupdate.pl b/regression-tests/tests/1dyndns-update-add-invalid-record/sendupdate.pl similarity index 100% rename from regression-tests/1dyndns-update-add-invalid-record/sendupdate.pl rename to regression-tests/tests/1dyndns-update-add-invalid-record/sendupdate.pl diff --git a/regression-tests/1dyndns-update-add-invalid-record/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-invalid-record/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-invalid-record/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-invalid-record/skip.nodyndns diff --git a/regression-tests/1dyndns-update-add-soa/command b/regression-tests/tests/1dyndns-update-add-soa/command similarity index 100% rename from regression-tests/1dyndns-update-add-soa/command rename to regression-tests/tests/1dyndns-update-add-soa/command diff --git a/regression-tests/1dyndns-update-add-soa/description b/regression-tests/tests/1dyndns-update-add-soa/description similarity index 100% rename from regression-tests/1dyndns-update-add-soa/description rename to regression-tests/tests/1dyndns-update-add-soa/description diff --git a/regression-tests/1dyndns-update-add-soa/expected_result b/regression-tests/tests/1dyndns-update-add-soa/expected_result similarity index 100% rename from regression-tests/1dyndns-update-add-soa/expected_result rename to regression-tests/tests/1dyndns-update-add-soa/expected_result diff --git a/regression-tests/1dyndns-update-add-soa/skip.nodyndns b/regression-tests/tests/1dyndns-update-add-soa/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-add-soa/skip.nodyndns rename to regression-tests/tests/1dyndns-update-add-soa/skip.nodyndns diff --git a/regression-tests/1dyndns-update-deep-add-delete/command b/regression-tests/tests/1dyndns-update-deep-add-delete/command similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/command rename to regression-tests/tests/1dyndns-update-deep-add-delete/command diff --git a/regression-tests/1dyndns-update-deep-add-delete/description b/regression-tests/tests/1dyndns-update-deep-add-delete/description similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/description rename to regression-tests/tests/1dyndns-update-deep-add-delete/description diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result b/regression-tests/tests/1dyndns-update-deep-add-delete/expected_result similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/expected_result rename to regression-tests/tests/1dyndns-update-deep-add-delete/expected_result diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec b/regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow b/regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/expected_result.narrow rename to regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.narrow diff --git a/regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-deep-add-delete/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-deep-add-delete/skip.nodyndns b/regression-tests/tests/1dyndns-update-deep-add-delete/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-deep-add-delete/skip.nodyndns rename to regression-tests/tests/1dyndns-update-deep-add-delete/skip.nodyndns diff --git a/regression-tests/1dyndns-update-deep-delegate/command b/regression-tests/tests/1dyndns-update-deep-delegate/command similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/command rename to regression-tests/tests/1dyndns-update-deep-delegate/command diff --git a/regression-tests/1dyndns-update-deep-delegate/description b/regression-tests/tests/1dyndns-update-deep-delegate/description similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/description rename to regression-tests/tests/1dyndns-update-deep-delegate/description diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result b/regression-tests/tests/1dyndns-update-deep-delegate/expected_result similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/expected_result rename to regression-tests/tests/1dyndns-update-deep-delegate/expected_result diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec b/regression-tests/tests/1dyndns-update-deep-delegate/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-deep-delegate/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.narrow b/regression-tests/tests/1dyndns-update-deep-delegate/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/expected_result.narrow rename to regression-tests/tests/1dyndns-update-deep-delegate/expected_result.narrow diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-deep-delegate/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-deep-delegate/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout rename to regression-tests/tests/1dyndns-update-deep-delegate/expected_result.nsec3-optout diff --git a/regression-tests/1dyndns-update-deep-delegate/skip-unboundhost b/regression-tests/tests/1dyndns-update-deep-delegate/skip-unboundhost similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/skip-unboundhost rename to regression-tests/tests/1dyndns-update-deep-delegate/skip-unboundhost diff --git a/regression-tests/1dyndns-update-deep-delegate/skip.nodyndns b/regression-tests/tests/1dyndns-update-deep-delegate/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-deep-delegate/skip.nodyndns rename to regression-tests/tests/1dyndns-update-deep-delegate/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delegate-in-between/command b/regression-tests/tests/1dyndns-update-delegate-in-between/command similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/command rename to regression-tests/tests/1dyndns-update-delegate-in-between/command diff --git a/regression-tests/1dyndns-update-delegate-in-between/description b/regression-tests/tests/1dyndns-update-delegate-in-between/description similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/description rename to regression-tests/tests/1dyndns-update-delegate-in-between/description diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/expected_result rename to regression-tests/tests/1dyndns-update-delegate-in-between/expected_result diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow rename to regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.narrow diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout rename to regression-tests/tests/1dyndns-update-delegate-in-between/expected_result.nsec3-optout diff --git a/regression-tests/1dyndns-update-delegate-in-between/skip.nodyndns b/regression-tests/tests/1dyndns-update-delegate-in-between/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delegate-in-between/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delegate-in-between/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delegate/command b/regression-tests/tests/1dyndns-update-delegate/command similarity index 100% rename from regression-tests/1dyndns-update-delegate/command rename to regression-tests/tests/1dyndns-update-delegate/command diff --git a/regression-tests/1dyndns-update-delegate/description b/regression-tests/tests/1dyndns-update-delegate/description similarity index 100% rename from regression-tests/1dyndns-update-delegate/description rename to regression-tests/tests/1dyndns-update-delegate/description diff --git a/regression-tests/1dyndns-update-delegate/expected_result b/regression-tests/tests/1dyndns-update-delegate/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delegate/expected_result rename to regression-tests/tests/1dyndns-update-delegate/expected_result diff --git a/regression-tests/1dyndns-update-delegate/expected_result.dnssec b/regression-tests/tests/1dyndns-update-delegate/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-delegate/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-delegate/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-delegate/expected_result.narrow b/regression-tests/tests/1dyndns-update-delegate/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-delegate/expected_result.narrow rename to regression-tests/tests/1dyndns-update-delegate/expected_result.narrow diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-delegate/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-delegate/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-delegate/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-delegate/expected_result.nsec3-optout similarity index 100% rename from regression-tests/1dyndns-update-delegate/expected_result.nsec3-optout rename to regression-tests/tests/1dyndns-update-delegate/expected_result.nsec3-optout diff --git a/regression-tests/1dyndns-update-delegate/skip-unboundhost b/regression-tests/tests/1dyndns-update-delegate/skip-unboundhost similarity index 100% rename from regression-tests/1dyndns-update-delegate/skip-unboundhost rename to regression-tests/tests/1dyndns-update-delegate/skip-unboundhost diff --git a/regression-tests/1dyndns-update-delegate/skip.nodyndns b/regression-tests/tests/1dyndns-update-delegate/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delegate/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delegate/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-add-host/command b/regression-tests/tests/1dyndns-update-delete-add-host/command similarity index 100% rename from regression-tests/1dyndns-update-delete-add-host/command rename to regression-tests/tests/1dyndns-update-delete-add-host/command diff --git a/regression-tests/1dyndns-update-delete-add-host/description b/regression-tests/tests/1dyndns-update-delete-add-host/description similarity index 100% rename from regression-tests/1dyndns-update-delete-add-host/description rename to regression-tests/tests/1dyndns-update-delete-add-host/description diff --git a/regression-tests/1dyndns-update-delete-add-host/expected_result b/regression-tests/tests/1dyndns-update-delete-add-host/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-add-host/expected_result rename to regression-tests/tests/1dyndns-update-delete-add-host/expected_result diff --git a/regression-tests/1dyndns-update-delete-add-host/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-add-host/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-add-host/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-add-host/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/command b/regression-tests/tests/1dyndns-update-delete-multi-add-host/command similarity index 100% rename from regression-tests/1dyndns-update-delete-multi-add-host/command rename to regression-tests/tests/1dyndns-update-delete-multi-add-host/command diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/description b/regression-tests/tests/1dyndns-update-delete-multi-add-host/description similarity index 100% rename from regression-tests/1dyndns-update-delete-multi-add-host/description rename to regression-tests/tests/1dyndns-update-delete-multi-add-host/description diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/expected_result b/regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-multi-add-host/expected_result rename to regression-tests/tests/1dyndns-update-delete-multi-add-host/expected_result diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-multi-add-host/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-multi-add-host/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-multi-add-host/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-mx-prio/command b/regression-tests/tests/1dyndns-update-delete-mx-prio/command similarity index 100% rename from regression-tests/1dyndns-update-delete-mx-prio/command rename to regression-tests/tests/1dyndns-update-delete-mx-prio/command diff --git a/regression-tests/1dyndns-update-delete-mx-prio/description b/regression-tests/tests/1dyndns-update-delete-mx-prio/description similarity index 100% rename from regression-tests/1dyndns-update-delete-mx-prio/description rename to regression-tests/tests/1dyndns-update-delete-mx-prio/description diff --git a/regression-tests/1dyndns-update-delete-mx-prio/expected_result b/regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-mx-prio/expected_result rename to regression-tests/tests/1dyndns-update-delete-mx-prio/expected_result diff --git a/regression-tests/1dyndns-update-delete-mx-prio/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-mx-prio/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-mx-prio/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-mx-prio/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-ns/command b/regression-tests/tests/1dyndns-update-delete-ns/command similarity index 100% rename from regression-tests/1dyndns-update-delete-ns/command rename to regression-tests/tests/1dyndns-update-delete-ns/command diff --git a/regression-tests/1dyndns-update-delete-ns/description b/regression-tests/tests/1dyndns-update-delete-ns/description similarity index 100% rename from regression-tests/1dyndns-update-delete-ns/description rename to regression-tests/tests/1dyndns-update-delete-ns/description diff --git a/regression-tests/1dyndns-update-delete-ns/expected_result b/regression-tests/tests/1dyndns-update-delete-ns/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-ns/expected_result rename to regression-tests/tests/1dyndns-update-delete-ns/expected_result diff --git a/regression-tests/1dyndns-update-delete-ns/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-ns/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-ns/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-ns/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/command b/regression-tests/tests/1dyndns-update-delete-parent-delegate/command similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/command rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/command diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/description b/regression-tests/tests/1dyndns-update-delete-parent-delegate/description similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/description rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/description diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/expected_result b/regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/expected_result rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/expected_result.dnssec b/regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/expected_result.narrow b/regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/expected_result.narrow rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.narrow diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3-optout b/regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3-optout similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3-optout rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/expected_result.nsec3-optout diff --git a/regression-tests/1dyndns-update-delete-parent-delegate/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-parent-delegate/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-parent-delegate/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-parent-delegate/skip.nodyndns diff --git a/regression-tests/1dyndns-update-delete-soa/command b/regression-tests/tests/1dyndns-update-delete-soa/command similarity index 100% rename from regression-tests/1dyndns-update-delete-soa/command rename to regression-tests/tests/1dyndns-update-delete-soa/command diff --git a/regression-tests/1dyndns-update-delete-soa/description b/regression-tests/tests/1dyndns-update-delete-soa/description similarity index 100% rename from regression-tests/1dyndns-update-delete-soa/description rename to regression-tests/tests/1dyndns-update-delete-soa/description diff --git a/regression-tests/1dyndns-update-delete-soa/expected_result b/regression-tests/tests/1dyndns-update-delete-soa/expected_result similarity index 100% rename from regression-tests/1dyndns-update-delete-soa/expected_result rename to regression-tests/tests/1dyndns-update-delete-soa/expected_result diff --git a/regression-tests/1dyndns-update-delete-soa/skip.nodyndns b/regression-tests/tests/1dyndns-update-delete-soa/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-delete-soa/skip.nodyndns rename to regression-tests/tests/1dyndns-update-delete-soa/skip.nodyndns diff --git a/regression-tests/1dyndns-update-in-between/command b/regression-tests/tests/1dyndns-update-in-between/command similarity index 100% rename from regression-tests/1dyndns-update-in-between/command rename to regression-tests/tests/1dyndns-update-in-between/command diff --git a/regression-tests/1dyndns-update-in-between/description b/regression-tests/tests/1dyndns-update-in-between/description similarity index 100% rename from regression-tests/1dyndns-update-in-between/description rename to regression-tests/tests/1dyndns-update-in-between/description diff --git a/regression-tests/1dyndns-update-in-between/expected_result b/regression-tests/tests/1dyndns-update-in-between/expected_result similarity index 100% rename from regression-tests/1dyndns-update-in-between/expected_result rename to regression-tests/tests/1dyndns-update-in-between/expected_result diff --git a/regression-tests/1dyndns-update-in-between/expected_result.dnssec b/regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec similarity index 100% rename from regression-tests/1dyndns-update-in-between/expected_result.dnssec rename to regression-tests/tests/1dyndns-update-in-between/expected_result.dnssec diff --git a/regression-tests/1dyndns-update-in-between/expected_result.narrow b/regression-tests/tests/1dyndns-update-in-between/expected_result.narrow similarity index 100% rename from regression-tests/1dyndns-update-in-between/expected_result.narrow rename to regression-tests/tests/1dyndns-update-in-between/expected_result.narrow diff --git a/regression-tests/1dyndns-update-in-between/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-in-between/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-in-between/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-in-between/skip.nodyndns b/regression-tests/tests/1dyndns-update-in-between/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-in-between/skip.nodyndns rename to regression-tests/tests/1dyndns-update-in-between/skip.nodyndns diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/command b/regression-tests/tests/1dyndns-update-nsec3params-with-others/command similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/command rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/command diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/description b/regression-tests/tests/1dyndns-update-nsec3params-with-others/description similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/description rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/description diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/expected_result b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/expected_result rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/skip.narrow b/regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.narrow similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/skip.narrow rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.narrow diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/skip.nodnssec b/regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.nodnssec similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/skip.nodnssec rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.nodnssec diff --git a/regression-tests/1dyndns-update-nsec3params-with-others/skip.nodyndns b/regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-nsec3params-with-others/skip.nodyndns rename to regression-tests/tests/1dyndns-update-nsec3params-with-others/skip.nodyndns diff --git a/regression-tests/1dyndns-update-nsec3params/command b/regression-tests/tests/1dyndns-update-nsec3params/command similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/command rename to regression-tests/tests/1dyndns-update-nsec3params/command diff --git a/regression-tests/1dyndns-update-nsec3params/description b/regression-tests/tests/1dyndns-update-nsec3params/description similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/description rename to regression-tests/tests/1dyndns-update-nsec3params/description diff --git a/regression-tests/1dyndns-update-nsec3params/expected_result b/regression-tests/tests/1dyndns-update-nsec3params/expected_result similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/expected_result rename to regression-tests/tests/1dyndns-update-nsec3params/expected_result diff --git a/regression-tests/1dyndns-update-nsec3params/expected_result.nsec3 b/regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3 similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/expected_result.nsec3 rename to regression-tests/tests/1dyndns-update-nsec3params/expected_result.nsec3 diff --git a/regression-tests/1dyndns-update-nsec3params/skip.narrow b/regression-tests/tests/1dyndns-update-nsec3params/skip.narrow similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/skip.narrow rename to regression-tests/tests/1dyndns-update-nsec3params/skip.narrow diff --git a/regression-tests/1dyndns-update-nsec3params/skip.nodnssec b/regression-tests/tests/1dyndns-update-nsec3params/skip.nodnssec similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/skip.nodnssec rename to regression-tests/tests/1dyndns-update-nsec3params/skip.nodnssec diff --git a/regression-tests/1dyndns-update-nsec3params/skip.nodyndns b/regression-tests/tests/1dyndns-update-nsec3params/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-nsec3params/skip.nodyndns rename to regression-tests/tests/1dyndns-update-nsec3params/skip.nodyndns diff --git a/regression-tests/1dyndns-update-replace-a-host/command b/regression-tests/tests/1dyndns-update-replace-a-host/command similarity index 100% rename from regression-tests/1dyndns-update-replace-a-host/command rename to regression-tests/tests/1dyndns-update-replace-a-host/command diff --git a/regression-tests/1dyndns-update-replace-a-host/description b/regression-tests/tests/1dyndns-update-replace-a-host/description similarity index 100% rename from regression-tests/1dyndns-update-replace-a-host/description rename to regression-tests/tests/1dyndns-update-replace-a-host/description diff --git a/regression-tests/1dyndns-update-replace-a-host/expected_result b/regression-tests/tests/1dyndns-update-replace-a-host/expected_result similarity index 100% rename from regression-tests/1dyndns-update-replace-a-host/expected_result rename to regression-tests/tests/1dyndns-update-replace-a-host/expected_result diff --git a/regression-tests/1dyndns-update-replace-a-host/skip.nodyndns b/regression-tests/tests/1dyndns-update-replace-a-host/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-replace-a-host/skip.nodyndns rename to regression-tests/tests/1dyndns-update-replace-a-host/skip.nodyndns diff --git a/regression-tests/1dyndns-update-replace-cname/command b/regression-tests/tests/1dyndns-update-replace-cname/command similarity index 100% rename from regression-tests/1dyndns-update-replace-cname/command rename to regression-tests/tests/1dyndns-update-replace-cname/command diff --git a/regression-tests/1dyndns-update-replace-cname/description b/regression-tests/tests/1dyndns-update-replace-cname/description similarity index 100% rename from regression-tests/1dyndns-update-replace-cname/description rename to regression-tests/tests/1dyndns-update-replace-cname/description diff --git a/regression-tests/1dyndns-update-replace-cname/expected_result b/regression-tests/tests/1dyndns-update-replace-cname/expected_result similarity index 100% rename from regression-tests/1dyndns-update-replace-cname/expected_result rename to regression-tests/tests/1dyndns-update-replace-cname/expected_result diff --git a/regression-tests/1dyndns-update-replace-cname/skip.nodyndns b/regression-tests/tests/1dyndns-update-replace-cname/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-replace-cname/skip.nodyndns rename to regression-tests/tests/1dyndns-update-replace-cname/skip.nodyndns diff --git a/regression-tests/1dyndns-update-replace-mx/command b/regression-tests/tests/1dyndns-update-replace-mx/command similarity index 100% rename from regression-tests/1dyndns-update-replace-mx/command rename to regression-tests/tests/1dyndns-update-replace-mx/command diff --git a/regression-tests/1dyndns-update-replace-mx/description b/regression-tests/tests/1dyndns-update-replace-mx/description similarity index 100% rename from regression-tests/1dyndns-update-replace-mx/description rename to regression-tests/tests/1dyndns-update-replace-mx/description diff --git a/regression-tests/1dyndns-update-replace-mx/expected_result b/regression-tests/tests/1dyndns-update-replace-mx/expected_result similarity index 100% rename from regression-tests/1dyndns-update-replace-mx/expected_result rename to regression-tests/tests/1dyndns-update-replace-mx/expected_result diff --git a/regression-tests/1dyndns-update-replace-mx/skip.nodyndns b/regression-tests/tests/1dyndns-update-replace-mx/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-replace-mx/skip.nodyndns rename to regression-tests/tests/1dyndns-update-replace-mx/skip.nodyndns diff --git a/regression-tests/1dyndns-update-srv/command b/regression-tests/tests/1dyndns-update-srv/command similarity index 100% rename from regression-tests/1dyndns-update-srv/command rename to regression-tests/tests/1dyndns-update-srv/command diff --git a/regression-tests/1dyndns-update-srv/description b/regression-tests/tests/1dyndns-update-srv/description similarity index 100% rename from regression-tests/1dyndns-update-srv/description rename to regression-tests/tests/1dyndns-update-srv/description diff --git a/regression-tests/1dyndns-update-srv/expected_result b/regression-tests/tests/1dyndns-update-srv/expected_result similarity index 100% rename from regression-tests/1dyndns-update-srv/expected_result rename to regression-tests/tests/1dyndns-update-srv/expected_result diff --git a/regression-tests/1dyndns-update-srv/skip.nodyndns b/regression-tests/tests/1dyndns-update-srv/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-srv/skip.nodyndns rename to regression-tests/tests/1dyndns-update-srv/skip.nodyndns diff --git a/regression-tests/1dyndns-update-update-ttl/command b/regression-tests/tests/1dyndns-update-update-ttl/command similarity index 100% rename from regression-tests/1dyndns-update-update-ttl/command rename to regression-tests/tests/1dyndns-update-update-ttl/command diff --git a/regression-tests/1dyndns-update-update-ttl/description b/regression-tests/tests/1dyndns-update-update-ttl/description similarity index 100% rename from regression-tests/1dyndns-update-update-ttl/description rename to regression-tests/tests/1dyndns-update-update-ttl/description diff --git a/regression-tests/1dyndns-update-update-ttl/expected_result b/regression-tests/tests/1dyndns-update-update-ttl/expected_result similarity index 100% rename from regression-tests/1dyndns-update-update-ttl/expected_result rename to regression-tests/tests/1dyndns-update-update-ttl/expected_result diff --git a/regression-tests/1dyndns-update-update-ttl/skip.nodyndns b/regression-tests/tests/1dyndns-update-update-ttl/skip.nodyndns similarity index 100% rename from regression-tests/1dyndns-update-update-ttl/skip.nodyndns rename to regression-tests/tests/1dyndns-update-update-ttl/skip.nodyndns diff --git a/regression-tests/2dyndns-update-replace-soa/command b/regression-tests/tests/2dyndns-update-replace-soa/command similarity index 100% rename from regression-tests/2dyndns-update-replace-soa/command rename to regression-tests/tests/2dyndns-update-replace-soa/command diff --git a/regression-tests/2dyndns-update-replace-soa/description b/regression-tests/tests/2dyndns-update-replace-soa/description similarity index 100% rename from regression-tests/2dyndns-update-replace-soa/description rename to regression-tests/tests/2dyndns-update-replace-soa/description diff --git a/regression-tests/2dyndns-update-replace-soa/expected_result b/regression-tests/tests/2dyndns-update-replace-soa/expected_result similarity index 100% rename from regression-tests/2dyndns-update-replace-soa/expected_result rename to regression-tests/tests/2dyndns-update-replace-soa/expected_result diff --git a/regression-tests/2dyndns-update-replace-soa/skip.nodyndns b/regression-tests/tests/2dyndns-update-replace-soa/skip.nodyndns similarity index 100% rename from regression-tests/2dyndns-update-replace-soa/skip.nodyndns rename to regression-tests/tests/2dyndns-update-replace-soa/skip.nodyndns diff --git a/regression-tests/5dyndns-restore-zone/command b/regression-tests/tests/5dyndns-restore-zone/command similarity index 100% rename from regression-tests/5dyndns-restore-zone/command rename to regression-tests/tests/5dyndns-restore-zone/command diff --git a/regression-tests/5dyndns-restore-zone/description b/regression-tests/tests/5dyndns-restore-zone/description similarity index 100% rename from regression-tests/5dyndns-restore-zone/description rename to regression-tests/tests/5dyndns-restore-zone/description diff --git a/regression-tests/5dyndns-restore-zone/expected_result b/regression-tests/tests/5dyndns-restore-zone/expected_result similarity index 100% rename from regression-tests/5dyndns-restore-zone/expected_result rename to regression-tests/tests/5dyndns-restore-zone/expected_result diff --git a/regression-tests/5dyndns-restore-zone/skip.nodyndns b/regression-tests/tests/5dyndns-restore-zone/skip.nodyndns similarity index 100% rename from regression-tests/5dyndns-restore-zone/skip.nodyndns rename to regression-tests/tests/5dyndns-restore-zone/skip.nodyndns diff --git a/regression-tests/8bit-txt-unescaped/command b/regression-tests/tests/8bit-txt-unescaped/command similarity index 100% rename from regression-tests/8bit-txt-unescaped/command rename to regression-tests/tests/8bit-txt-unescaped/command diff --git a/regression-tests/8bit-txt-unescaped/description b/regression-tests/tests/8bit-txt-unescaped/description similarity index 100% rename from regression-tests/8bit-txt-unescaped/description rename to regression-tests/tests/8bit-txt-unescaped/description diff --git a/regression-tests/8bit-txt-unescaped/expected_result b/regression-tests/tests/8bit-txt-unescaped/expected_result similarity index 100% rename from regression-tests/8bit-txt-unescaped/expected_result rename to regression-tests/tests/8bit-txt-unescaped/expected_result diff --git a/regression-tests/8bit-txt/command b/regression-tests/tests/8bit-txt/command similarity index 100% rename from regression-tests/8bit-txt/command rename to regression-tests/tests/8bit-txt/command diff --git a/regression-tests/8bit-txt/description b/regression-tests/tests/8bit-txt/description similarity index 100% rename from regression-tests/8bit-txt/description rename to regression-tests/tests/8bit-txt/description diff --git a/regression-tests/8bit-txt/expected_result b/regression-tests/tests/8bit-txt/expected_result similarity index 100% rename from regression-tests/8bit-txt/expected_result rename to regression-tests/tests/8bit-txt/expected_result diff --git a/regression-tests/any-nxdomain/command b/regression-tests/tests/any-nxdomain/command similarity index 100% rename from regression-tests/any-nxdomain/command rename to regression-tests/tests/any-nxdomain/command diff --git a/regression-tests/any-nxdomain/description b/regression-tests/tests/any-nxdomain/description similarity index 100% rename from regression-tests/any-nxdomain/description rename to regression-tests/tests/any-nxdomain/description diff --git a/regression-tests/any-nxdomain/expected_result b/regression-tests/tests/any-nxdomain/expected_result similarity index 100% rename from regression-tests/any-nxdomain/expected_result rename to regression-tests/tests/any-nxdomain/expected_result diff --git a/regression-tests/any-nxdomain/expected_result.dnssec b/regression-tests/tests/any-nxdomain/expected_result.dnssec similarity index 100% rename from regression-tests/any-nxdomain/expected_result.dnssec rename to regression-tests/tests/any-nxdomain/expected_result.dnssec diff --git a/regression-tests/any-nxdomain/expected_result.narrow b/regression-tests/tests/any-nxdomain/expected_result.narrow similarity index 100% rename from regression-tests/any-nxdomain/expected_result.narrow rename to regression-tests/tests/any-nxdomain/expected_result.narrow diff --git a/regression-tests/any-nxdomain/expected_result.nsec3 b/regression-tests/tests/any-nxdomain/expected_result.nsec3 similarity index 100% rename from regression-tests/any-nxdomain/expected_result.nsec3 rename to regression-tests/tests/any-nxdomain/expected_result.nsec3 diff --git a/regression-tests/any-query/command b/regression-tests/tests/any-query/command similarity index 100% rename from regression-tests/any-query/command rename to regression-tests/tests/any-query/command diff --git a/regression-tests/any-query/description b/regression-tests/tests/any-query/description similarity index 100% rename from regression-tests/any-query/description rename to regression-tests/tests/any-query/description diff --git a/regression-tests/any-query/expected_result b/regression-tests/tests/any-query/expected_result similarity index 100% rename from regression-tests/any-query/expected_result rename to regression-tests/tests/any-query/expected_result diff --git a/regression-tests/any-wildcard-dnssec/command b/regression-tests/tests/any-wildcard-dnssec/command similarity index 100% rename from regression-tests/any-wildcard-dnssec/command rename to regression-tests/tests/any-wildcard-dnssec/command diff --git a/regression-tests/any-wildcard-dnssec/description b/regression-tests/tests/any-wildcard-dnssec/description similarity index 100% rename from regression-tests/any-wildcard-dnssec/description rename to regression-tests/tests/any-wildcard-dnssec/description diff --git a/regression-tests/any-wildcard-dnssec/expected_result b/regression-tests/tests/any-wildcard-dnssec/expected_result similarity index 100% rename from regression-tests/any-wildcard-dnssec/expected_result rename to regression-tests/tests/any-wildcard-dnssec/expected_result diff --git a/regression-tests/any-wildcard-dnssec/expected_result.narrow b/regression-tests/tests/any-wildcard-dnssec/expected_result.narrow similarity index 100% rename from regression-tests/any-wildcard-dnssec/expected_result.narrow rename to regression-tests/tests/any-wildcard-dnssec/expected_result.narrow diff --git a/regression-tests/any-wildcard-dnssec/expected_result.nsec3 b/regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3 similarity index 100% rename from regression-tests/any-wildcard-dnssec/expected_result.nsec3 rename to regression-tests/tests/any-wildcard-dnssec/expected_result.nsec3 diff --git a/regression-tests/any-wildcard-dnssec/skip.nodnssec b/regression-tests/tests/any-wildcard-dnssec/skip.nodnssec similarity index 100% rename from regression-tests/any-wildcard-dnssec/skip.nodnssec rename to regression-tests/tests/any-wildcard-dnssec/skip.nodnssec diff --git a/regression-tests/any-wildcard/command b/regression-tests/tests/any-wildcard/command similarity index 100% rename from regression-tests/any-wildcard/command rename to regression-tests/tests/any-wildcard/command diff --git a/regression-tests/any-wildcard/description b/regression-tests/tests/any-wildcard/description similarity index 100% rename from regression-tests/any-wildcard/description rename to regression-tests/tests/any-wildcard/description diff --git a/regression-tests/any-wildcard/expected_result b/regression-tests/tests/any-wildcard/expected_result similarity index 100% rename from regression-tests/any-wildcard/expected_result rename to regression-tests/tests/any-wildcard/expected_result diff --git a/regression-tests/apex-level-a-but-no-a/command b/regression-tests/tests/apex-level-a-but-no-a/command similarity index 100% rename from regression-tests/apex-level-a-but-no-a/command rename to regression-tests/tests/apex-level-a-but-no-a/command diff --git a/regression-tests/apex-level-a-but-no-a/description b/regression-tests/tests/apex-level-a-but-no-a/description similarity index 100% rename from regression-tests/apex-level-a-but-no-a/description rename to regression-tests/tests/apex-level-a-but-no-a/description diff --git a/regression-tests/apex-level-a-but-no-a/expected_result b/regression-tests/tests/apex-level-a-but-no-a/expected_result similarity index 100% rename from regression-tests/apex-level-a-but-no-a/expected_result rename to regression-tests/tests/apex-level-a-but-no-a/expected_result diff --git a/regression-tests/apex-level-a/command b/regression-tests/tests/apex-level-a/command similarity index 100% rename from regression-tests/apex-level-a/command rename to regression-tests/tests/apex-level-a/command diff --git a/regression-tests/apex-level-a/description b/regression-tests/tests/apex-level-a/description similarity index 100% rename from regression-tests/apex-level-a/description rename to regression-tests/tests/apex-level-a/description diff --git a/regression-tests/apex-level-a/expected_result b/regression-tests/tests/apex-level-a/expected_result similarity index 100% rename from regression-tests/apex-level-a/expected_result rename to regression-tests/tests/apex-level-a/expected_result diff --git a/regression-tests/apex-level-ns/command b/regression-tests/tests/apex-level-ns/command similarity index 100% rename from regression-tests/apex-level-ns/command rename to regression-tests/tests/apex-level-ns/command diff --git a/regression-tests/apex-level-ns/description b/regression-tests/tests/apex-level-ns/description similarity index 100% rename from regression-tests/apex-level-ns/description rename to regression-tests/tests/apex-level-ns/description diff --git a/regression-tests/apex-level-ns/expected_result b/regression-tests/tests/apex-level-ns/expected_result similarity index 100% rename from regression-tests/apex-level-ns/expected_result rename to regression-tests/tests/apex-level-ns/expected_result diff --git a/regression-tests/basic-a-resolution/command b/regression-tests/tests/basic-a-resolution/command similarity index 100% rename from regression-tests/basic-a-resolution/command rename to regression-tests/tests/basic-a-resolution/command diff --git a/regression-tests/basic-a-resolution/description b/regression-tests/tests/basic-a-resolution/description similarity index 100% rename from regression-tests/basic-a-resolution/description rename to regression-tests/tests/basic-a-resolution/description diff --git a/regression-tests/basic-a-resolution/expected_result b/regression-tests/tests/basic-a-resolution/expected_result similarity index 100% rename from regression-tests/basic-a-resolution/expected_result rename to regression-tests/tests/basic-a-resolution/expected_result diff --git a/regression-tests/basic-aaaa-resolution/command b/regression-tests/tests/basic-aaaa-resolution/command similarity index 100% rename from regression-tests/basic-aaaa-resolution/command rename to regression-tests/tests/basic-aaaa-resolution/command diff --git a/regression-tests/basic-aaaa-resolution/description b/regression-tests/tests/basic-aaaa-resolution/description similarity index 100% rename from regression-tests/basic-aaaa-resolution/description rename to regression-tests/tests/basic-aaaa-resolution/description diff --git a/regression-tests/basic-aaaa-resolution/expected_result b/regression-tests/tests/basic-aaaa-resolution/expected_result similarity index 100% rename from regression-tests/basic-aaaa-resolution/expected_result rename to regression-tests/tests/basic-aaaa-resolution/expected_result diff --git a/regression-tests/basic-eui48/command b/regression-tests/tests/basic-eui48/command similarity index 100% rename from regression-tests/basic-eui48/command rename to regression-tests/tests/basic-eui48/command diff --git a/regression-tests/basic-eui48/description b/regression-tests/tests/basic-eui48/description similarity index 100% rename from regression-tests/basic-eui48/description rename to regression-tests/tests/basic-eui48/description diff --git a/regression-tests/basic-eui48/expected_result b/regression-tests/tests/basic-eui48/expected_result similarity index 100% rename from regression-tests/basic-eui48/expected_result rename to regression-tests/tests/basic-eui48/expected_result diff --git a/regression-tests/basic-eui48/skip.bind b/regression-tests/tests/basic-eui48/skip.bind similarity index 100% rename from regression-tests/basic-eui48/skip.bind rename to regression-tests/tests/basic-eui48/skip.bind diff --git a/regression-tests/basic-eui48/skip.mydns b/regression-tests/tests/basic-eui48/skip.mydns similarity index 100% rename from regression-tests/basic-eui48/skip.mydns rename to regression-tests/tests/basic-eui48/skip.mydns diff --git a/regression-tests/basic-eui48/skip.nsd b/regression-tests/tests/basic-eui48/skip.nsd similarity index 100% rename from regression-tests/basic-eui48/skip.nsd rename to regression-tests/tests/basic-eui48/skip.nsd diff --git a/regression-tests/basic-eui64/command b/regression-tests/tests/basic-eui64/command similarity index 100% rename from regression-tests/basic-eui64/command rename to regression-tests/tests/basic-eui64/command diff --git a/regression-tests/basic-eui64/description b/regression-tests/tests/basic-eui64/description similarity index 100% rename from regression-tests/basic-eui64/description rename to regression-tests/tests/basic-eui64/description diff --git a/regression-tests/basic-eui64/expected_result b/regression-tests/tests/basic-eui64/expected_result similarity index 100% rename from regression-tests/basic-eui64/expected_result rename to regression-tests/tests/basic-eui64/expected_result diff --git a/regression-tests/basic-eui64/skip.bind b/regression-tests/tests/basic-eui64/skip.bind similarity index 100% rename from regression-tests/basic-eui64/skip.bind rename to regression-tests/tests/basic-eui64/skip.bind diff --git a/regression-tests/basic-eui64/skip.mydns b/regression-tests/tests/basic-eui64/skip.mydns similarity index 100% rename from regression-tests/basic-eui64/skip.mydns rename to regression-tests/tests/basic-eui64/skip.mydns diff --git a/regression-tests/basic-eui64/skip.nsd b/regression-tests/tests/basic-eui64/skip.nsd similarity index 100% rename from regression-tests/basic-eui64/skip.nsd rename to regression-tests/tests/basic-eui64/skip.nsd diff --git a/regression-tests/basic-hinfo/command b/regression-tests/tests/basic-hinfo/command similarity index 100% rename from regression-tests/basic-hinfo/command rename to regression-tests/tests/basic-hinfo/command diff --git a/regression-tests/basic-hinfo/description b/regression-tests/tests/basic-hinfo/description similarity index 100% rename from regression-tests/basic-hinfo/description rename to regression-tests/tests/basic-hinfo/description diff --git a/regression-tests/basic-hinfo/expected_result b/regression-tests/tests/basic-hinfo/expected_result similarity index 100% rename from regression-tests/basic-hinfo/expected_result rename to regression-tests/tests/basic-hinfo/expected_result diff --git a/regression-tests/basic-loc/command b/regression-tests/tests/basic-loc/command similarity index 100% rename from regression-tests/basic-loc/command rename to regression-tests/tests/basic-loc/command diff --git a/regression-tests/basic-loc/description b/regression-tests/tests/basic-loc/description similarity index 100% rename from regression-tests/basic-loc/description rename to regression-tests/tests/basic-loc/description diff --git a/regression-tests/basic-loc/expected_result b/regression-tests/tests/basic-loc/expected_result similarity index 100% rename from regression-tests/basic-loc/expected_result rename to regression-tests/tests/basic-loc/expected_result diff --git a/regression-tests/basic-loc/skip.mydns b/regression-tests/tests/basic-loc/skip.mydns similarity index 100% rename from regression-tests/basic-loc/skip.mydns rename to regression-tests/tests/basic-loc/skip.mydns diff --git a/regression-tests/basic-nonzone/command b/regression-tests/tests/basic-nonzone/command similarity index 100% rename from regression-tests/basic-nonzone/command rename to regression-tests/tests/basic-nonzone/command diff --git a/regression-tests/basic-nonzone/description b/regression-tests/tests/basic-nonzone/description similarity index 100% rename from regression-tests/basic-nonzone/description rename to regression-tests/tests/basic-nonzone/description diff --git a/regression-tests/basic-nonzone/expected_result b/regression-tests/tests/basic-nonzone/expected_result similarity index 100% rename from regression-tests/basic-nonzone/expected_result rename to regression-tests/tests/basic-nonzone/expected_result diff --git a/regression-tests/basic-nonzone/skip-unboundhost b/regression-tests/tests/basic-nonzone/skip-unboundhost similarity index 100% rename from regression-tests/basic-nonzone/skip-unboundhost rename to regression-tests/tests/basic-nonzone/skip-unboundhost diff --git a/regression-tests/basic-ns-resolution/command b/regression-tests/tests/basic-ns-resolution/command similarity index 100% rename from regression-tests/basic-ns-resolution/command rename to regression-tests/tests/basic-ns-resolution/command diff --git a/regression-tests/basic-ns-resolution/description b/regression-tests/tests/basic-ns-resolution/description similarity index 100% rename from regression-tests/basic-ns-resolution/description rename to regression-tests/tests/basic-ns-resolution/description diff --git a/regression-tests/basic-ns-resolution/expected_result b/regression-tests/tests/basic-ns-resolution/expected_result similarity index 100% rename from regression-tests/basic-ns-resolution/expected_result rename to regression-tests/tests/basic-ns-resolution/expected_result diff --git a/regression-tests/basic-soa-resolution/command b/regression-tests/tests/basic-soa-resolution/command similarity index 100% rename from regression-tests/basic-soa-resolution/command rename to regression-tests/tests/basic-soa-resolution/command diff --git a/regression-tests/basic-soa-resolution/description b/regression-tests/tests/basic-soa-resolution/description similarity index 100% rename from regression-tests/basic-soa-resolution/description rename to regression-tests/tests/basic-soa-resolution/description diff --git a/regression-tests/basic-soa-resolution/expected_result b/regression-tests/tests/basic-soa-resolution/expected_result similarity index 100% rename from regression-tests/basic-soa-resolution/expected_result rename to regression-tests/tests/basic-soa-resolution/expected_result diff --git a/regression-tests/basic-srv/command b/regression-tests/tests/basic-srv/command similarity index 100% rename from regression-tests/basic-srv/command rename to regression-tests/tests/basic-srv/command diff --git a/regression-tests/basic-srv/description b/regression-tests/tests/basic-srv/description similarity index 100% rename from regression-tests/basic-srv/description rename to regression-tests/tests/basic-srv/description diff --git a/regression-tests/basic-srv/expected_result b/regression-tests/tests/basic-srv/expected_result similarity index 100% rename from regression-tests/basic-srv/expected_result rename to regression-tests/tests/basic-srv/expected_result diff --git a/regression-tests/basic-txt-resolution/command b/regression-tests/tests/basic-txt-resolution/command similarity index 100% rename from regression-tests/basic-txt-resolution/command rename to regression-tests/tests/basic-txt-resolution/command diff --git a/regression-tests/basic-txt-resolution/description b/regression-tests/tests/basic-txt-resolution/description similarity index 100% rename from regression-tests/basic-txt-resolution/description rename to regression-tests/tests/basic-txt-resolution/description diff --git a/regression-tests/basic-txt-resolution/expected_result b/regression-tests/tests/basic-txt-resolution/expected_result similarity index 100% rename from regression-tests/basic-txt-resolution/expected_result rename to regression-tests/tests/basic-txt-resolution/expected_result diff --git a/regression-tests/big-axfr/command b/regression-tests/tests/big-axfr/command similarity index 100% rename from regression-tests/big-axfr/command rename to regression-tests/tests/big-axfr/command diff --git a/regression-tests/big-axfr/description b/regression-tests/tests/big-axfr/description similarity index 100% rename from regression-tests/big-axfr/description rename to regression-tests/tests/big-axfr/description diff --git a/regression-tests/big-axfr/expected_result b/regression-tests/tests/big-axfr/expected_result similarity index 100% rename from regression-tests/big-axfr/expected_result rename to regression-tests/tests/big-axfr/expected_result diff --git a/regression-tests/bind-add-zone/command b/regression-tests/tests/bind-add-zone/command similarity index 63% rename from regression-tests/bind-add-zone/command rename to regression-tests/tests/bind-add-zone/command index 46f41b610..fde5aa88e 100755 --- a/regression-tests/bind-add-zone/command +++ b/regression-tests/tests/bind-add-zone/command @@ -6,10 +6,10 @@ fi cleandig ns1.addzone.com A cleandig ns1.test.com A -../pdns/pdns_control --config-dir=. bind-add-zone addzone.com addzone.com +../pdns/pdns_control --config-dir=. bind-add-zone addzone.com zones/addzone.com ../pdns/pdns_control --config-dir=. purge addzone.com sleep 1 -../pdns/pdns_control --config-dir=. bind-add-zone addzone.com addzone.com +../pdns/pdns_control --config-dir=. bind-add-zone addzone.com zones/addzone.com sleep 1 cleandig ns1.addzone.com A sleep 1 diff --git a/regression-tests/bind-add-zone/description b/regression-tests/tests/bind-add-zone/description similarity index 100% rename from regression-tests/bind-add-zone/description rename to regression-tests/tests/bind-add-zone/description diff --git a/regression-tests/bind-add-zone/expected_result b/regression-tests/tests/bind-add-zone/expected_result similarity index 100% rename from regression-tests/bind-add-zone/expected_result rename to regression-tests/tests/bind-add-zone/expected_result diff --git a/regression-tests/bind-add-zone/expected_result.bind b/regression-tests/tests/bind-add-zone/expected_result.bind similarity index 97% rename from regression-tests/bind-add-zone/expected_result.bind rename to regression-tests/tests/bind-add-zone/expected_result.bind index cfb53189d..6f13aa05b 100644 --- a/regression-tests/bind-add-zone/expected_result.bind +++ b/regression-tests/tests/bind-add-zone/expected_result.bind @@ -29,7 +29,7 @@ Reply to question for qname='ns1.addzone.com.', qtype=A 0 ns1.test.com. IN A 3600 1.1.1.1 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='ns1.test.com.', qtype=A -Loaded zone addzone.com from addzone.com +Loaded zone addzone.com from zones/addzone.com 0 Already loaded Rcode: 2, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 diff --git a/regression-tests/bind-add-zone/skip.presigned b/regression-tests/tests/bind-add-zone/skip.presigned similarity index 100% rename from regression-tests/bind-add-zone/skip.presigned rename to regression-tests/tests/bind-add-zone/skip.presigned diff --git a/regression-tests/bind-add-zone/stress/README b/regression-tests/tests/bind-add-zone/stress/README similarity index 100% rename from regression-tests/bind-add-zone/stress/README rename to regression-tests/tests/bind-add-zone/stress/README diff --git a/regression-tests/bind-add-zone/stress/addzones.sh b/regression-tests/tests/bind-add-zone/stress/addzones.sh similarity index 100% rename from regression-tests/bind-add-zone/stress/addzones.sh rename to regression-tests/tests/bind-add-zone/stress/addzones.sh diff --git a/regression-tests/bind-add-zone/stress/createzones.sh b/regression-tests/tests/bind-add-zone/stress/createzones.sh similarity index 100% rename from regression-tests/bind-add-zone/stress/createzones.sh rename to regression-tests/tests/bind-add-zone/stress/createzones.sh diff --git a/regression-tests/bind-add-zone/stress/dnsperf.sh b/regression-tests/tests/bind-add-zone/stress/dnsperf.sh similarity index 100% rename from regression-tests/bind-add-zone/stress/dnsperf.sh rename to regression-tests/tests/bind-add-zone/stress/dnsperf.sh diff --git a/regression-tests/bind-add-zone/stress/run.sh b/regression-tests/tests/bind-add-zone/stress/run.sh similarity index 100% rename from regression-tests/bind-add-zone/stress/run.sh rename to regression-tests/tests/bind-add-zone/stress/run.sh diff --git a/regression-tests/cname-and-wildcard-at-root/command b/regression-tests/tests/cname-and-wildcard-at-root/command similarity index 100% rename from regression-tests/cname-and-wildcard-at-root/command rename to regression-tests/tests/cname-and-wildcard-at-root/command diff --git a/regression-tests/cname-and-wildcard-at-root/description b/regression-tests/tests/cname-and-wildcard-at-root/description similarity index 100% rename from regression-tests/cname-and-wildcard-at-root/description rename to regression-tests/tests/cname-and-wildcard-at-root/description diff --git a/regression-tests/cname-and-wildcard-at-root/expected_result b/regression-tests/tests/cname-and-wildcard-at-root/expected_result similarity index 100% rename from regression-tests/cname-and-wildcard-at-root/expected_result rename to regression-tests/tests/cname-and-wildcard-at-root/expected_result diff --git a/regression-tests/cname-and-wildcard-but-no-correct-type/command b/regression-tests/tests/cname-and-wildcard-but-no-correct-type/command similarity index 100% rename from regression-tests/cname-and-wildcard-but-no-correct-type/command rename to regression-tests/tests/cname-and-wildcard-but-no-correct-type/command diff --git a/regression-tests/cname-and-wildcard-but-no-correct-type/description b/regression-tests/tests/cname-and-wildcard-but-no-correct-type/description similarity index 100% rename from regression-tests/cname-and-wildcard-but-no-correct-type/description rename to regression-tests/tests/cname-and-wildcard-but-no-correct-type/description diff --git a/regression-tests/cname-and-wildcard-but-no-correct-type/expected_result b/regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result similarity index 100% rename from regression-tests/cname-and-wildcard-but-no-correct-type/expected_result rename to regression-tests/tests/cname-and-wildcard-but-no-correct-type/expected_result diff --git a/regression-tests/cname-and-wildcard/command b/regression-tests/tests/cname-and-wildcard/command similarity index 100% rename from regression-tests/cname-and-wildcard/command rename to regression-tests/tests/cname-and-wildcard/command diff --git a/regression-tests/cname-and-wildcard/description b/regression-tests/tests/cname-and-wildcard/description similarity index 100% rename from regression-tests/cname-and-wildcard/description rename to regression-tests/tests/cname-and-wildcard/description diff --git a/regression-tests/cname-and-wildcard/expected_result b/regression-tests/tests/cname-and-wildcard/expected_result similarity index 100% rename from regression-tests/cname-and-wildcard/expected_result rename to regression-tests/tests/cname-and-wildcard/expected_result diff --git a/regression-tests/cname-but-no-correct-type/command b/regression-tests/tests/cname-but-no-correct-type/command similarity index 100% rename from regression-tests/cname-but-no-correct-type/command rename to regression-tests/tests/cname-but-no-correct-type/command diff --git a/regression-tests/cname-but-no-correct-type/description b/regression-tests/tests/cname-but-no-correct-type/description similarity index 100% rename from regression-tests/cname-but-no-correct-type/description rename to regression-tests/tests/cname-but-no-correct-type/description diff --git a/regression-tests/cname-but-no-correct-type/expected_result b/regression-tests/tests/cname-but-no-correct-type/expected_result similarity index 100% rename from regression-tests/cname-but-no-correct-type/expected_result rename to regression-tests/tests/cname-but-no-correct-type/expected_result diff --git a/regression-tests/cname-loop-breakout/command b/regression-tests/tests/cname-loop-breakout/command similarity index 100% rename from regression-tests/cname-loop-breakout/command rename to regression-tests/tests/cname-loop-breakout/command diff --git a/regression-tests/cname-loop-breakout/description b/regression-tests/tests/cname-loop-breakout/description similarity index 100% rename from regression-tests/cname-loop-breakout/description rename to regression-tests/tests/cname-loop-breakout/description diff --git a/regression-tests/cname-loop-breakout/expected_result b/regression-tests/tests/cname-loop-breakout/expected_result similarity index 100% rename from regression-tests/cname-loop-breakout/expected_result rename to regression-tests/tests/cname-loop-breakout/expected_result diff --git a/regression-tests/cname-loop-breakout/skip-unboundhost b/regression-tests/tests/cname-loop-breakout/skip-unboundhost similarity index 100% rename from regression-tests/cname-loop-breakout/skip-unboundhost rename to regression-tests/tests/cname-loop-breakout/skip-unboundhost diff --git a/regression-tests/cname-to-nxdomain-any/command b/regression-tests/tests/cname-to-nxdomain-any/command similarity index 100% rename from regression-tests/cname-to-nxdomain-any/command rename to regression-tests/tests/cname-to-nxdomain-any/command diff --git a/regression-tests/cname-to-nxdomain-any/description b/regression-tests/tests/cname-to-nxdomain-any/description similarity index 100% rename from regression-tests/cname-to-nxdomain-any/description rename to regression-tests/tests/cname-to-nxdomain-any/description diff --git a/regression-tests/cname-to-nxdomain-any/expected_result b/regression-tests/tests/cname-to-nxdomain-any/expected_result similarity index 100% rename from regression-tests/cname-to-nxdomain-any/expected_result rename to regression-tests/tests/cname-to-nxdomain-any/expected_result diff --git a/regression-tests/cname-to-nxdomain-any/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec similarity index 100% rename from regression-tests/cname-to-nxdomain-any/expected_result.dnssec rename to regression-tests/tests/cname-to-nxdomain-any/expected_result.dnssec diff --git a/regression-tests/cname-to-nxdomain-any/expected_result.narrow b/regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow similarity index 100% rename from regression-tests/cname-to-nxdomain-any/expected_result.narrow rename to regression-tests/tests/cname-to-nxdomain-any/expected_result.narrow diff --git a/regression-tests/cname-to-nxdomain-any/expected_result.nsec3 b/regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3 similarity index 100% rename from regression-tests/cname-to-nxdomain-any/expected_result.nsec3 rename to regression-tests/tests/cname-to-nxdomain-any/expected_result.nsec3 diff --git a/regression-tests/cname-to-nxdomain/command b/regression-tests/tests/cname-to-nxdomain/command similarity index 100% rename from regression-tests/cname-to-nxdomain/command rename to regression-tests/tests/cname-to-nxdomain/command diff --git a/regression-tests/cname-to-nxdomain/description b/regression-tests/tests/cname-to-nxdomain/description similarity index 100% rename from regression-tests/cname-to-nxdomain/description rename to regression-tests/tests/cname-to-nxdomain/description diff --git a/regression-tests/cname-to-nxdomain/expected_result b/regression-tests/tests/cname-to-nxdomain/expected_result similarity index 100% rename from regression-tests/cname-to-nxdomain/expected_result rename to regression-tests/tests/cname-to-nxdomain/expected_result diff --git a/regression-tests/cname-to-nxdomain/expected_result.dnssec b/regression-tests/tests/cname-to-nxdomain/expected_result.dnssec similarity index 100% rename from regression-tests/cname-to-nxdomain/expected_result.dnssec rename to regression-tests/tests/cname-to-nxdomain/expected_result.dnssec diff --git a/regression-tests/cname-to-nxdomain/expected_result.narrow b/regression-tests/tests/cname-to-nxdomain/expected_result.narrow similarity index 100% rename from regression-tests/cname-to-nxdomain/expected_result.narrow rename to regression-tests/tests/cname-to-nxdomain/expected_result.narrow diff --git a/regression-tests/cname-to-nxdomain/expected_result.nsec3 b/regression-tests/tests/cname-to-nxdomain/expected_result.nsec3 similarity index 100% rename from regression-tests/cname-to-nxdomain/expected_result.nsec3 rename to regression-tests/tests/cname-to-nxdomain/expected_result.nsec3 diff --git a/regression-tests/cname-to-referral/command b/regression-tests/tests/cname-to-referral/command similarity index 100% rename from regression-tests/cname-to-referral/command rename to regression-tests/tests/cname-to-referral/command diff --git a/regression-tests/cname-to-referral/description b/regression-tests/tests/cname-to-referral/description similarity index 100% rename from regression-tests/cname-to-referral/description rename to regression-tests/tests/cname-to-referral/description diff --git a/regression-tests/cname-to-referral/expected_result b/regression-tests/tests/cname-to-referral/expected_result similarity index 100% rename from regression-tests/cname-to-referral/expected_result rename to regression-tests/tests/cname-to-referral/expected_result diff --git a/regression-tests/cname-to-referral/skip-unboundhost b/regression-tests/tests/cname-to-referral/skip-unboundhost similarity index 100% rename from regression-tests/cname-to-referral/skip-unboundhost rename to regression-tests/tests/cname-to-referral/skip-unboundhost diff --git a/regression-tests/cname-to-unauth-any/command b/regression-tests/tests/cname-to-unauth-any/command similarity index 100% rename from regression-tests/cname-to-unauth-any/command rename to regression-tests/tests/cname-to-unauth-any/command diff --git a/regression-tests/cname-to-unauth-any/description b/regression-tests/tests/cname-to-unauth-any/description similarity index 100% rename from regression-tests/cname-to-unauth-any/description rename to regression-tests/tests/cname-to-unauth-any/description diff --git a/regression-tests/cname-to-unauth-any/expected_result b/regression-tests/tests/cname-to-unauth-any/expected_result similarity index 100% rename from regression-tests/cname-to-unauth-any/expected_result rename to regression-tests/tests/cname-to-unauth-any/expected_result diff --git a/regression-tests/cname-to-unauth-any/expected_result.dnssec b/regression-tests/tests/cname-to-unauth-any/expected_result.dnssec similarity index 100% rename from regression-tests/cname-to-unauth-any/expected_result.dnssec rename to regression-tests/tests/cname-to-unauth-any/expected_result.dnssec diff --git a/regression-tests/cname-to-unauth-any/skip-unboundhost b/regression-tests/tests/cname-to-unauth-any/skip-unboundhost similarity index 100% rename from regression-tests/cname-to-unauth-any/skip-unboundhost rename to regression-tests/tests/cname-to-unauth-any/skip-unboundhost diff --git a/regression-tests/cname-to-unauth/command b/regression-tests/tests/cname-to-unauth/command similarity index 100% rename from regression-tests/cname-to-unauth/command rename to regression-tests/tests/cname-to-unauth/command diff --git a/regression-tests/cname-to-unauth/description b/regression-tests/tests/cname-to-unauth/description similarity index 100% rename from regression-tests/cname-to-unauth/description rename to regression-tests/tests/cname-to-unauth/description diff --git a/regression-tests/cname-to-unauth/expected_result b/regression-tests/tests/cname-to-unauth/expected_result similarity index 100% rename from regression-tests/cname-to-unauth/expected_result rename to regression-tests/tests/cname-to-unauth/expected_result diff --git a/regression-tests/cname-to-unauth/expected_result.dnssec b/regression-tests/tests/cname-to-unauth/expected_result.dnssec similarity index 100% rename from regression-tests/cname-to-unauth/expected_result.dnssec rename to regression-tests/tests/cname-to-unauth/expected_result.dnssec diff --git a/regression-tests/cname-to-unauth/skip-unboundhost b/regression-tests/tests/cname-to-unauth/skip-unboundhost similarity index 100% rename from regression-tests/cname-to-unauth/skip-unboundhost rename to regression-tests/tests/cname-to-unauth/skip-unboundhost diff --git a/regression-tests/cname-wildcard-chain/command b/regression-tests/tests/cname-wildcard-chain/command similarity index 100% rename from regression-tests/cname-wildcard-chain/command rename to regression-tests/tests/cname-wildcard-chain/command diff --git a/regression-tests/cname-wildcard-chain/description b/regression-tests/tests/cname-wildcard-chain/description similarity index 100% rename from regression-tests/cname-wildcard-chain/description rename to regression-tests/tests/cname-wildcard-chain/description diff --git a/regression-tests/cname-wildcard-chain/expected_result b/regression-tests/tests/cname-wildcard-chain/expected_result similarity index 100% rename from regression-tests/cname-wildcard-chain/expected_result rename to regression-tests/tests/cname-wildcard-chain/expected_result diff --git a/regression-tests/cname-wildcard-chain/expected_result.dnssec b/regression-tests/tests/cname-wildcard-chain/expected_result.dnssec similarity index 100% rename from regression-tests/cname-wildcard-chain/expected_result.dnssec rename to regression-tests/tests/cname-wildcard-chain/expected_result.dnssec diff --git a/regression-tests/cname-wildcard-chain/expected_result.narrow b/regression-tests/tests/cname-wildcard-chain/expected_result.narrow similarity index 100% rename from regression-tests/cname-wildcard-chain/expected_result.narrow rename to regression-tests/tests/cname-wildcard-chain/expected_result.narrow diff --git a/regression-tests/cname-wildcard-chain/expected_result.nsec3 b/regression-tests/tests/cname-wildcard-chain/expected_result.nsec3 similarity index 100% rename from regression-tests/cname-wildcard-chain/expected_result.nsec3 rename to regression-tests/tests/cname-wildcard-chain/expected_result.nsec3 diff --git a/regression-tests/cname-wildcard-chain/skip-unboundhost b/regression-tests/tests/cname-wildcard-chain/skip-unboundhost similarity index 100% rename from regression-tests/cname-wildcard-chain/skip-unboundhost rename to regression-tests/tests/cname-wildcard-chain/skip-unboundhost diff --git a/regression-tests/cname-wildcard-chain/skip.oracle-nsec3 b/regression-tests/tests/cname-wildcard-chain/skip.oracle-nsec3 similarity index 100% rename from regression-tests/cname-wildcard-chain/skip.oracle-nsec3 rename to regression-tests/tests/cname-wildcard-chain/skip.oracle-nsec3 diff --git a/regression-tests/cross-domain-cname-to-wildcard/command b/regression-tests/tests/cross-domain-cname-to-wildcard/command similarity index 100% rename from regression-tests/cross-domain-cname-to-wildcard/command rename to regression-tests/tests/cross-domain-cname-to-wildcard/command diff --git a/regression-tests/cross-domain-cname-to-wildcard/description b/regression-tests/tests/cross-domain-cname-to-wildcard/description similarity index 100% rename from regression-tests/cross-domain-cname-to-wildcard/description rename to regression-tests/tests/cross-domain-cname-to-wildcard/description diff --git a/regression-tests/cross-domain-cname-to-wildcard/expected_result b/regression-tests/tests/cross-domain-cname-to-wildcard/expected_result similarity index 100% rename from regression-tests/cross-domain-cname-to-wildcard/expected_result rename to regression-tests/tests/cross-domain-cname-to-wildcard/expected_result diff --git a/regression-tests/direct-dnskey/command b/regression-tests/tests/direct-dnskey/command similarity index 100% rename from regression-tests/direct-dnskey/command rename to regression-tests/tests/direct-dnskey/command diff --git a/regression-tests/direct-dnskey/description b/regression-tests/tests/direct-dnskey/description similarity index 100% rename from regression-tests/direct-dnskey/description rename to regression-tests/tests/direct-dnskey/description diff --git a/regression-tests/direct-dnskey/expected_result b/regression-tests/tests/direct-dnskey/expected_result similarity index 100% rename from regression-tests/direct-dnskey/expected_result rename to regression-tests/tests/direct-dnskey/expected_result diff --git a/regression-tests/direct-dnskey/expected_result.dnssec b/regression-tests/tests/direct-dnskey/expected_result.dnssec similarity index 100% rename from regression-tests/direct-dnskey/expected_result.dnssec rename to regression-tests/tests/direct-dnskey/expected_result.dnssec diff --git a/regression-tests/direct-rrsig/command b/regression-tests/tests/direct-rrsig/command similarity index 100% rename from regression-tests/direct-rrsig/command rename to regression-tests/tests/direct-rrsig/command diff --git a/regression-tests/direct-rrsig/description b/regression-tests/tests/direct-rrsig/description similarity index 100% rename from regression-tests/direct-rrsig/description rename to regression-tests/tests/direct-rrsig/description diff --git a/regression-tests/direct-rrsig/expected_result b/regression-tests/tests/direct-rrsig/expected_result similarity index 100% rename from regression-tests/direct-rrsig/expected_result rename to regression-tests/tests/direct-rrsig/expected_result diff --git a/regression-tests/direct-rrsig/expected_result.dnssec b/regression-tests/tests/direct-rrsig/expected_result.dnssec similarity index 100% rename from regression-tests/direct-rrsig/expected_result.dnssec rename to regression-tests/tests/direct-rrsig/expected_result.dnssec diff --git a/regression-tests/direct-rrsig/expected_result.narrow b/regression-tests/tests/direct-rrsig/expected_result.narrow similarity index 100% rename from regression-tests/direct-rrsig/expected_result.narrow rename to regression-tests/tests/direct-rrsig/expected_result.narrow diff --git a/regression-tests/direct-rrsig/expected_result.nsec3 b/regression-tests/tests/direct-rrsig/expected_result.nsec3 similarity index 100% rename from regression-tests/direct-rrsig/expected_result.nsec3 rename to regression-tests/tests/direct-rrsig/expected_result.nsec3 diff --git a/regression-tests/direct-rrsig/skip-q b/regression-tests/tests/direct-rrsig/skip-q similarity index 100% rename from regression-tests/direct-rrsig/skip-q rename to regression-tests/tests/direct-rrsig/skip-q diff --git a/regression-tests/direct-wildcard/command b/regression-tests/tests/direct-wildcard/command similarity index 100% rename from regression-tests/direct-wildcard/command rename to regression-tests/tests/direct-wildcard/command diff --git a/regression-tests/direct-wildcard/description b/regression-tests/tests/direct-wildcard/description similarity index 100% rename from regression-tests/direct-wildcard/description rename to regression-tests/tests/direct-wildcard/description diff --git a/regression-tests/direct-wildcard/expected_result b/regression-tests/tests/direct-wildcard/expected_result similarity index 100% rename from regression-tests/direct-wildcard/expected_result rename to regression-tests/tests/direct-wildcard/expected_result diff --git a/regression-tests/double-srv/command b/regression-tests/tests/double-srv/command similarity index 100% rename from regression-tests/double-srv/command rename to regression-tests/tests/double-srv/command diff --git a/regression-tests/double-srv/description b/regression-tests/tests/double-srv/description similarity index 100% rename from regression-tests/double-srv/description rename to regression-tests/tests/double-srv/description diff --git a/regression-tests/double-srv/expected_result b/regression-tests/tests/double-srv/expected_result similarity index 100% rename from regression-tests/double-srv/expected_result rename to regression-tests/tests/double-srv/expected_result diff --git a/regression-tests/double/command b/regression-tests/tests/double/command similarity index 100% rename from regression-tests/double/command rename to regression-tests/tests/double/command diff --git a/regression-tests/double/description b/regression-tests/tests/double/description similarity index 100% rename from regression-tests/double/description rename to regression-tests/tests/double/description diff --git a/regression-tests/double/expected_result b/regression-tests/tests/double/expected_result similarity index 100% rename from regression-tests/double/expected_result rename to regression-tests/tests/double/expected_result diff --git a/regression-tests/double/expected_result.dnssec b/regression-tests/tests/double/expected_result.dnssec similarity index 100% rename from regression-tests/double/expected_result.dnssec rename to regression-tests/tests/double/expected_result.dnssec diff --git a/regression-tests/double/skip.mydns b/regression-tests/tests/double/skip.mydns similarity index 100% rename from regression-tests/double/skip.mydns rename to regression-tests/tests/double/skip.mydns diff --git a/regression-tests/ds-at-apex-noerror/command b/regression-tests/tests/ds-at-apex-noerror/command similarity index 100% rename from regression-tests/ds-at-apex-noerror/command rename to regression-tests/tests/ds-at-apex-noerror/command diff --git a/regression-tests/ds-at-apex-noerror/description b/regression-tests/tests/ds-at-apex-noerror/description similarity index 100% rename from regression-tests/ds-at-apex-noerror/description rename to regression-tests/tests/ds-at-apex-noerror/description diff --git a/regression-tests/ds-at-apex-noerror/expected_result b/regression-tests/tests/ds-at-apex-noerror/expected_result similarity index 100% rename from regression-tests/ds-at-apex-noerror/expected_result rename to regression-tests/tests/ds-at-apex-noerror/expected_result diff --git a/regression-tests/ds-at-apex-noerror/expected_result.dnssec b/regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec similarity index 100% rename from regression-tests/ds-at-apex-noerror/expected_result.dnssec rename to regression-tests/tests/ds-at-apex-noerror/expected_result.dnssec diff --git a/regression-tests/ds-at-apex-noerror/expected_result.narrow b/regression-tests/tests/ds-at-apex-noerror/expected_result.narrow similarity index 100% rename from regression-tests/ds-at-apex-noerror/expected_result.narrow rename to regression-tests/tests/ds-at-apex-noerror/expected_result.narrow diff --git a/regression-tests/ds-at-apex-noerror/expected_result.nsec3 b/regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3 similarity index 100% rename from regression-tests/ds-at-apex-noerror/expected_result.nsec3 rename to regression-tests/tests/ds-at-apex-noerror/expected_result.nsec3 diff --git a/regression-tests/ds-at-both-sides/command b/regression-tests/tests/ds-at-both-sides/command similarity index 100% rename from regression-tests/ds-at-both-sides/command rename to regression-tests/tests/ds-at-both-sides/command diff --git a/regression-tests/ds-at-both-sides/description b/regression-tests/tests/ds-at-both-sides/description similarity index 100% rename from regression-tests/ds-at-both-sides/description rename to regression-tests/tests/ds-at-both-sides/description diff --git a/regression-tests/ds-at-both-sides/expected_result b/regression-tests/tests/ds-at-both-sides/expected_result similarity index 100% rename from regression-tests/ds-at-both-sides/expected_result rename to regression-tests/tests/ds-at-both-sides/expected_result diff --git a/regression-tests/ds-at-both-sides/skip.nodnssec b/regression-tests/tests/ds-at-both-sides/skip.nodnssec similarity index 100% rename from regression-tests/ds-at-both-sides/skip.nodnssec rename to regression-tests/tests/ds-at-both-sides/skip.nodnssec diff --git a/regression-tests/ds-at-secure-delegation/command b/regression-tests/tests/ds-at-secure-delegation/command similarity index 100% rename from regression-tests/ds-at-secure-delegation/command rename to regression-tests/tests/ds-at-secure-delegation/command diff --git a/regression-tests/ds-at-secure-delegation/description b/regression-tests/tests/ds-at-secure-delegation/description similarity index 100% rename from regression-tests/ds-at-secure-delegation/description rename to regression-tests/tests/ds-at-secure-delegation/description diff --git a/regression-tests/ds-at-secure-delegation/expected_result b/regression-tests/tests/ds-at-secure-delegation/expected_result similarity index 100% rename from regression-tests/ds-at-secure-delegation/expected_result rename to regression-tests/tests/ds-at-secure-delegation/expected_result diff --git a/regression-tests/ds-at-secure-delegation/expected_result.dnssec b/regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec similarity index 100% rename from regression-tests/ds-at-secure-delegation/expected_result.dnssec rename to regression-tests/tests/ds-at-secure-delegation/expected_result.dnssec diff --git a/regression-tests/ds-at-secure-delegation/skip.mydns b/regression-tests/tests/ds-at-secure-delegation/skip.mydns similarity index 100% rename from regression-tests/ds-at-secure-delegation/skip.mydns rename to regression-tests/tests/ds-at-secure-delegation/skip.mydns diff --git a/regression-tests/ds-at-unsecure-delegation/command b/regression-tests/tests/ds-at-unsecure-delegation/command similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/command rename to regression-tests/tests/ds-at-unsecure-delegation/command diff --git a/regression-tests/ds-at-unsecure-delegation/description b/regression-tests/tests/ds-at-unsecure-delegation/description similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/description rename to regression-tests/tests/ds-at-unsecure-delegation/description diff --git a/regression-tests/ds-at-unsecure-delegation/expected_result b/regression-tests/tests/ds-at-unsecure-delegation/expected_result similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/expected_result rename to regression-tests/tests/ds-at-unsecure-delegation/expected_result diff --git a/regression-tests/ds-at-unsecure-delegation/expected_result.narrow b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/expected_result.narrow rename to regression-tests/tests/ds-at-unsecure-delegation/expected_result.narrow diff --git a/regression-tests/ds-at-unsecure-delegation/expected_result.nsec3 b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3 similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/expected_result.nsec3 rename to regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3 diff --git a/regression-tests/ds-at-unsecure-delegation/expected_result.nsec3-optout b/regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/expected_result.nsec3-optout rename to regression-tests/tests/ds-at-unsecure-delegation/expected_result.nsec3-optout diff --git a/regression-tests/ds-at-unsecure-delegation/skip.nodnssec b/regression-tests/tests/ds-at-unsecure-delegation/skip.nodnssec similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/skip.nodnssec rename to regression-tests/tests/ds-at-unsecure-delegation/skip.nodnssec diff --git a/regression-tests/ds-at-unsecure-delegation/skip.oracle-nsec b/regression-tests/tests/ds-at-unsecure-delegation/skip.oracle-nsec similarity index 100% rename from regression-tests/ds-at-unsecure-delegation/skip.oracle-nsec rename to regression-tests/tests/ds-at-unsecure-delegation/skip.oracle-nsec diff --git a/regression-tests/ds-at-unsecure-zone-cut/command b/regression-tests/tests/ds-at-unsecure-zone-cut/command similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/command rename to regression-tests/tests/ds-at-unsecure-zone-cut/command diff --git a/regression-tests/ds-at-unsecure-zone-cut/description b/regression-tests/tests/ds-at-unsecure-zone-cut/description similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/description rename to regression-tests/tests/ds-at-unsecure-zone-cut/description diff --git a/regression-tests/ds-at-unsecure-zone-cut/expected_result b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/expected_result rename to regression-tests/tests/ds-at-unsecure-zone-cut/expected_result diff --git a/regression-tests/ds-at-unsecure-zone-cut/expected_result.narrow b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/expected_result.narrow rename to regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.narrow diff --git a/regression-tests/ds-at-unsecure-zone-cut/expected_result.nsec3 b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3 similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/expected_result.nsec3 rename to regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3 diff --git a/regression-tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout b/regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout rename to regression-tests/tests/ds-at-unsecure-zone-cut/expected_result.nsec3-optout diff --git a/regression-tests/ds-at-unsecure-zone-cut/skip.nodnssec b/regression-tests/tests/ds-at-unsecure-zone-cut/skip.nodnssec similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/skip.nodnssec rename to regression-tests/tests/ds-at-unsecure-zone-cut/skip.nodnssec diff --git a/regression-tests/ds-at-unsecure-zone-cut/skip.oracle-nsec b/regression-tests/tests/ds-at-unsecure-zone-cut/skip.oracle-nsec similarity index 100% rename from regression-tests/ds-at-unsecure-zone-cut/skip.oracle-nsec rename to regression-tests/tests/ds-at-unsecure-zone-cut/skip.oracle-nsec diff --git a/regression-tests/ds-inside-delegation/command b/regression-tests/tests/ds-inside-delegation/command similarity index 100% rename from regression-tests/ds-inside-delegation/command rename to regression-tests/tests/ds-inside-delegation/command diff --git a/regression-tests/ds-inside-delegation/description b/regression-tests/tests/ds-inside-delegation/description similarity index 100% rename from regression-tests/ds-inside-delegation/description rename to regression-tests/tests/ds-inside-delegation/description diff --git a/regression-tests/ds-inside-delegation/expected_result b/regression-tests/tests/ds-inside-delegation/expected_result similarity index 100% rename from regression-tests/ds-inside-delegation/expected_result rename to regression-tests/tests/ds-inside-delegation/expected_result diff --git a/regression-tests/ds-inside-delegation/expected_result.dnssec b/regression-tests/tests/ds-inside-delegation/expected_result.dnssec similarity index 100% rename from regression-tests/ds-inside-delegation/expected_result.dnssec rename to regression-tests/tests/ds-inside-delegation/expected_result.dnssec diff --git a/regression-tests/ds-inside-delegation/expected_result.narrow b/regression-tests/tests/ds-inside-delegation/expected_result.narrow similarity index 100% rename from regression-tests/ds-inside-delegation/expected_result.narrow rename to regression-tests/tests/ds-inside-delegation/expected_result.narrow diff --git a/regression-tests/ds-inside-delegation/expected_result.nsec3 b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3 similarity index 100% rename from regression-tests/ds-inside-delegation/expected_result.nsec3 rename to regression-tests/tests/ds-inside-delegation/expected_result.nsec3 diff --git a/regression-tests/ds-inside-delegation/expected_result.nsec3-optout b/regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ds-inside-delegation/expected_result.nsec3-optout rename to regression-tests/tests/ds-inside-delegation/expected_result.nsec3-optout diff --git a/regression-tests/ds-inside-delegation/skip-unboundhost b/regression-tests/tests/ds-inside-delegation/skip-unboundhost similarity index 100% rename from regression-tests/ds-inside-delegation/skip-unboundhost rename to regression-tests/tests/ds-inside-delegation/skip-unboundhost diff --git a/regression-tests/ds-inside-delegation/skip.oracle-nsec b/regression-tests/tests/ds-inside-delegation/skip.oracle-nsec similarity index 100% rename from regression-tests/ds-inside-delegation/skip.oracle-nsec rename to regression-tests/tests/ds-inside-delegation/skip.oracle-nsec diff --git a/regression-tests/ds-inside-delegation/skip.oracle-nsec3 b/regression-tests/tests/ds-inside-delegation/skip.oracle-nsec3 similarity index 100% rename from regression-tests/ds-inside-delegation/skip.oracle-nsec3 rename to regression-tests/tests/ds-inside-delegation/skip.oracle-nsec3 diff --git a/regression-tests/ent-any/command b/regression-tests/tests/ent-any/command similarity index 100% rename from regression-tests/ent-any/command rename to regression-tests/tests/ent-any/command diff --git a/regression-tests/ent-any/description b/regression-tests/tests/ent-any/description similarity index 100% rename from regression-tests/ent-any/description rename to regression-tests/tests/ent-any/description diff --git a/regression-tests/ent-any/expected_result b/regression-tests/tests/ent-any/expected_result similarity index 100% rename from regression-tests/ent-any/expected_result rename to regression-tests/tests/ent-any/expected_result diff --git a/regression-tests/ent-any/expected_result.dnssec b/regression-tests/tests/ent-any/expected_result.dnssec similarity index 100% rename from regression-tests/ent-any/expected_result.dnssec rename to regression-tests/tests/ent-any/expected_result.dnssec diff --git a/regression-tests/ent-any/expected_result.narrow b/regression-tests/tests/ent-any/expected_result.narrow similarity index 100% rename from regression-tests/ent-any/expected_result.narrow rename to regression-tests/tests/ent-any/expected_result.narrow diff --git a/regression-tests/ent-any/expected_result.nsec3 b/regression-tests/tests/ent-any/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-any/expected_result.nsec3 rename to regression-tests/tests/ent-any/expected_result.nsec3 diff --git a/regression-tests/ent-any/expected_result.nsec3-optout b/regression-tests/tests/ent-any/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ent-any/expected_result.nsec3-optout rename to regression-tests/tests/ent-any/expected_result.nsec3-optout diff --git a/regression-tests/ent-any/skip.noent b/regression-tests/tests/ent-any/skip.noent similarity index 100% rename from regression-tests/ent-any/skip.noent rename to regression-tests/tests/ent-any/skip.noent diff --git a/regression-tests/ent-asterisk/command b/regression-tests/tests/ent-asterisk/command similarity index 100% rename from regression-tests/ent-asterisk/command rename to regression-tests/tests/ent-asterisk/command diff --git a/regression-tests/ent-asterisk/description b/regression-tests/tests/ent-asterisk/description similarity index 100% rename from regression-tests/ent-asterisk/description rename to regression-tests/tests/ent-asterisk/description diff --git a/regression-tests/ent-asterisk/expected_result b/regression-tests/tests/ent-asterisk/expected_result similarity index 100% rename from regression-tests/ent-asterisk/expected_result rename to regression-tests/tests/ent-asterisk/expected_result diff --git a/regression-tests/ent-asterisk/expected_result.dnssec b/regression-tests/tests/ent-asterisk/expected_result.dnssec similarity index 86% rename from regression-tests/ent-asterisk/expected_result.dnssec rename to regression-tests/tests/ent-asterisk/expected_result.dnssec index 98cd61b77..b1854e292 100644 --- a/regression-tests/ent-asterisk/expected_result.dnssec +++ b/regression-tests/tests/ent-asterisk/expected_result.dnssec @@ -7,4 +7,4 @@ 2 . IN OPT 32768 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 Reply to question for qname='sub.host.sub.example.com.', qtype=A -./ent-asterisk/unbound-host.out:sub.host.sub.example.com has no address (BOGUS (security failure)) +./tests/ent-asterisk/unbound-host.out:sub.host.sub.example.com has no address (BOGUS (security failure)) diff --git a/regression-tests/ent-asterisk/expected_result.narrow b/regression-tests/tests/ent-asterisk/expected_result.narrow similarity index 100% rename from regression-tests/ent-asterisk/expected_result.narrow rename to regression-tests/tests/ent-asterisk/expected_result.narrow diff --git a/regression-tests/ent-asterisk/expected_result.nsec3 b/regression-tests/tests/ent-asterisk/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-asterisk/expected_result.nsec3 rename to regression-tests/tests/ent-asterisk/expected_result.nsec3 diff --git a/regression-tests/ent-asterisk/skip.bind b/regression-tests/tests/ent-asterisk/skip.bind similarity index 100% rename from regression-tests/ent-asterisk/skip.bind rename to regression-tests/tests/ent-asterisk/skip.bind diff --git a/regression-tests/ent-asterisk/skip.noent b/regression-tests/tests/ent-asterisk/skip.noent similarity index 100% rename from regression-tests/ent-asterisk/skip.noent rename to regression-tests/tests/ent-asterisk/skip.noent diff --git a/regression-tests/ent-axfr/command b/regression-tests/tests/ent-axfr/command similarity index 100% rename from regression-tests/ent-axfr/command rename to regression-tests/tests/ent-axfr/command diff --git a/regression-tests/ent-axfr/description b/regression-tests/tests/ent-axfr/description similarity index 100% rename from regression-tests/ent-axfr/description rename to regression-tests/tests/ent-axfr/description diff --git a/regression-tests/ent-axfr/expected_result b/regression-tests/tests/ent-axfr/expected_result similarity index 100% rename from regression-tests/ent-axfr/expected_result rename to regression-tests/tests/ent-axfr/expected_result diff --git a/regression-tests/ent-axfr/expected_result.nsec3 b/regression-tests/tests/ent-axfr/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-axfr/expected_result.nsec3 rename to regression-tests/tests/ent-axfr/expected_result.nsec3 diff --git a/regression-tests/ent-axfr/expected_result.nsec3-optout b/regression-tests/tests/ent-axfr/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ent-axfr/expected_result.nsec3-optout rename to regression-tests/tests/ent-axfr/expected_result.nsec3-optout diff --git a/regression-tests/ent-axfr/skip.narrow b/regression-tests/tests/ent-axfr/skip.narrow similarity index 100% rename from regression-tests/ent-axfr/skip.narrow rename to regression-tests/tests/ent-axfr/skip.narrow diff --git a/regression-tests/ent-axfr/skip.nodnssec b/regression-tests/tests/ent-axfr/skip.nodnssec similarity index 100% rename from regression-tests/ent-axfr/skip.nodnssec rename to regression-tests/tests/ent-axfr/skip.nodnssec diff --git a/regression-tests/ent-axfr/skip.noent b/regression-tests/tests/ent-axfr/skip.noent similarity index 100% rename from regression-tests/ent-axfr/skip.noent rename to regression-tests/tests/ent-axfr/skip.noent diff --git a/regression-tests/ent-axfr/use.drill b/regression-tests/tests/ent-axfr/use.drill similarity index 100% rename from regression-tests/ent-axfr/use.drill rename to regression-tests/tests/ent-axfr/use.drill diff --git a/regression-tests/ent-rr-enclosed-in-ent/command b/regression-tests/tests/ent-rr-enclosed-in-ent/command similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/command rename to regression-tests/tests/ent-rr-enclosed-in-ent/command diff --git a/regression-tests/ent-rr-enclosed-in-ent/description b/regression-tests/tests/ent-rr-enclosed-in-ent/description similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/description rename to regression-tests/tests/ent-rr-enclosed-in-ent/description diff --git a/regression-tests/ent-rr-enclosed-in-ent/expected_result b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/expected_result rename to regression-tests/tests/ent-rr-enclosed-in-ent/expected_result diff --git a/regression-tests/ent-rr-enclosed-in-ent/expected_result.dnssec b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/expected_result.dnssec rename to regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.dnssec diff --git a/regression-tests/ent-rr-enclosed-in-ent/expected_result.narrow b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/expected_result.narrow rename to regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.narrow diff --git a/regression-tests/ent-rr-enclosed-in-ent/expected_result.nsec3 b/regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/expected_result.nsec3 rename to regression-tests/tests/ent-rr-enclosed-in-ent/expected_result.nsec3 diff --git a/regression-tests/ent-rr-enclosed-in-ent/skip.nodnssec b/regression-tests/tests/ent-rr-enclosed-in-ent/skip.nodnssec similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/skip.nodnssec rename to regression-tests/tests/ent-rr-enclosed-in-ent/skip.nodnssec diff --git a/regression-tests/ent-rr-enclosed-in-ent/skip.noent b/regression-tests/tests/ent-rr-enclosed-in-ent/skip.noent similarity index 100% rename from regression-tests/ent-rr-enclosed-in-ent/skip.noent rename to regression-tests/tests/ent-rr-enclosed-in-ent/skip.noent diff --git a/regression-tests/ent-soa/command b/regression-tests/tests/ent-soa/command similarity index 100% rename from regression-tests/ent-soa/command rename to regression-tests/tests/ent-soa/command diff --git a/regression-tests/ent-soa/description b/regression-tests/tests/ent-soa/description similarity index 100% rename from regression-tests/ent-soa/description rename to regression-tests/tests/ent-soa/description diff --git a/regression-tests/ent-soa/expected_result b/regression-tests/tests/ent-soa/expected_result similarity index 100% rename from regression-tests/ent-soa/expected_result rename to regression-tests/tests/ent-soa/expected_result diff --git a/regression-tests/ent-soa/expected_result.dnssec b/regression-tests/tests/ent-soa/expected_result.dnssec similarity index 100% rename from regression-tests/ent-soa/expected_result.dnssec rename to regression-tests/tests/ent-soa/expected_result.dnssec diff --git a/regression-tests/ent-soa/expected_result.narrow b/regression-tests/tests/ent-soa/expected_result.narrow similarity index 100% rename from regression-tests/ent-soa/expected_result.narrow rename to regression-tests/tests/ent-soa/expected_result.narrow diff --git a/regression-tests/ent-soa/expected_result.nsec3 b/regression-tests/tests/ent-soa/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-soa/expected_result.nsec3 rename to regression-tests/tests/ent-soa/expected_result.nsec3 diff --git a/regression-tests/ent-soa/expected_result.nsec3-optout b/regression-tests/tests/ent-soa/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ent-soa/expected_result.nsec3-optout rename to regression-tests/tests/ent-soa/expected_result.nsec3-optout diff --git a/regression-tests/ent-soa/skip.noent b/regression-tests/tests/ent-soa/skip.noent similarity index 100% rename from regression-tests/ent-soa/skip.noent rename to regression-tests/tests/ent-soa/skip.noent diff --git a/regression-tests/ent-wildcard-below-ent/command b/regression-tests/tests/ent-wildcard-below-ent/command similarity index 100% rename from regression-tests/ent-wildcard-below-ent/command rename to regression-tests/tests/ent-wildcard-below-ent/command diff --git a/regression-tests/ent-wildcard-below-ent/description b/regression-tests/tests/ent-wildcard-below-ent/description similarity index 100% rename from regression-tests/ent-wildcard-below-ent/description rename to regression-tests/tests/ent-wildcard-below-ent/description diff --git a/regression-tests/ent-wildcard-below-ent/expected_result b/regression-tests/tests/ent-wildcard-below-ent/expected_result similarity index 100% rename from regression-tests/ent-wildcard-below-ent/expected_result rename to regression-tests/tests/ent-wildcard-below-ent/expected_result diff --git a/regression-tests/ent-wildcard-below-ent/expected_result.dnssec b/regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec similarity index 100% rename from regression-tests/ent-wildcard-below-ent/expected_result.dnssec rename to regression-tests/tests/ent-wildcard-below-ent/expected_result.dnssec diff --git a/regression-tests/ent-wildcard-below-ent/expected_result.narrow b/regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow similarity index 100% rename from regression-tests/ent-wildcard-below-ent/expected_result.narrow rename to regression-tests/tests/ent-wildcard-below-ent/expected_result.narrow diff --git a/regression-tests/ent-wildcard-below-ent/expected_result.nsec3 b/regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3 similarity index 100% rename from regression-tests/ent-wildcard-below-ent/expected_result.nsec3 rename to regression-tests/tests/ent-wildcard-below-ent/expected_result.nsec3 diff --git a/regression-tests/ent-wildcard-below-ent/skip.noent b/regression-tests/tests/ent-wildcard-below-ent/skip.noent similarity index 100% rename from regression-tests/ent-wildcard-below-ent/skip.noent rename to regression-tests/tests/ent-wildcard-below-ent/skip.noent diff --git a/regression-tests/ent/command b/regression-tests/tests/ent/command similarity index 100% rename from regression-tests/ent/command rename to regression-tests/tests/ent/command diff --git a/regression-tests/ent/description b/regression-tests/tests/ent/description similarity index 100% rename from regression-tests/ent/description rename to regression-tests/tests/ent/description diff --git a/regression-tests/ent/expected_result b/regression-tests/tests/ent/expected_result similarity index 100% rename from regression-tests/ent/expected_result rename to regression-tests/tests/ent/expected_result diff --git a/regression-tests/ent/expected_result.dnssec b/regression-tests/tests/ent/expected_result.dnssec similarity index 100% rename from regression-tests/ent/expected_result.dnssec rename to regression-tests/tests/ent/expected_result.dnssec diff --git a/regression-tests/ent/expected_result.narrow b/regression-tests/tests/ent/expected_result.narrow similarity index 100% rename from regression-tests/ent/expected_result.narrow rename to regression-tests/tests/ent/expected_result.narrow diff --git a/regression-tests/ent/expected_result.nsec3 b/regression-tests/tests/ent/expected_result.nsec3 similarity index 100% rename from regression-tests/ent/expected_result.nsec3 rename to regression-tests/tests/ent/expected_result.nsec3 diff --git a/regression-tests/ent/expected_result.nsec3-optout b/regression-tests/tests/ent/expected_result.nsec3-optout similarity index 100% rename from regression-tests/ent/expected_result.nsec3-optout rename to regression-tests/tests/ent/expected_result.nsec3-optout diff --git a/regression-tests/ent/skip.noent b/regression-tests/tests/ent/skip.noent similarity index 100% rename from regression-tests/ent/skip.noent rename to regression-tests/tests/ent/skip.noent diff --git a/regression-tests/escaped-txt/command b/regression-tests/tests/escaped-txt/command similarity index 100% rename from regression-tests/escaped-txt/command rename to regression-tests/tests/escaped-txt/command diff --git a/regression-tests/escaped-txt/description b/regression-tests/tests/escaped-txt/description similarity index 100% rename from regression-tests/escaped-txt/description rename to regression-tests/tests/escaped-txt/description diff --git a/regression-tests/escaped-txt/expected_result b/regression-tests/tests/escaped-txt/expected_result similarity index 100% rename from regression-tests/escaped-txt/expected_result rename to regression-tests/tests/escaped-txt/expected_result diff --git a/regression-tests/external-cname-pointer/command b/regression-tests/tests/external-cname-pointer/command similarity index 100% rename from regression-tests/external-cname-pointer/command rename to regression-tests/tests/external-cname-pointer/command diff --git a/regression-tests/external-cname-pointer/description b/regression-tests/tests/external-cname-pointer/description similarity index 100% rename from regression-tests/external-cname-pointer/description rename to regression-tests/tests/external-cname-pointer/description diff --git a/regression-tests/external-cname-pointer/expected_result b/regression-tests/tests/external-cname-pointer/expected_result similarity index 100% rename from regression-tests/external-cname-pointer/expected_result rename to regression-tests/tests/external-cname-pointer/expected_result diff --git a/regression-tests/external-cname-pointer/skip-unboundhost b/regression-tests/tests/external-cname-pointer/skip-unboundhost similarity index 100% rename from regression-tests/external-cname-pointer/skip-unboundhost rename to regression-tests/tests/external-cname-pointer/skip-unboundhost diff --git a/regression-tests/fancy-axfr/command b/regression-tests/tests/fancy-axfr/command similarity index 100% rename from regression-tests/fancy-axfr/command rename to regression-tests/tests/fancy-axfr/command diff --git a/regression-tests/fancy-axfr/description b/regression-tests/tests/fancy-axfr/description similarity index 100% rename from regression-tests/fancy-axfr/description rename to regression-tests/tests/fancy-axfr/description diff --git a/regression-tests/fancy-axfr/expected_result b/regression-tests/tests/fancy-axfr/expected_result similarity index 100% rename from regression-tests/fancy-axfr/expected_result rename to regression-tests/tests/fancy-axfr/expected_result diff --git a/regression-tests/five-levels-wildcard-one-below-apex/command b/regression-tests/tests/five-levels-wildcard-one-below-apex/command similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/command rename to regression-tests/tests/five-levels-wildcard-one-below-apex/command diff --git a/regression-tests/five-levels-wildcard-one-below-apex/description b/regression-tests/tests/five-levels-wildcard-one-below-apex/description similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/description rename to regression-tests/tests/five-levels-wildcard-one-below-apex/description diff --git a/regression-tests/five-levels-wildcard-one-below-apex/expected_result b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/expected_result rename to regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result diff --git a/regression-tests/five-levels-wildcard-one-below-apex/expected_result.narrow b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/expected_result.narrow rename to regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.narrow diff --git a/regression-tests/five-levels-wildcard-one-below-apex/expected_result.nsec3 b/regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3 similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/expected_result.nsec3 rename to regression-tests/tests/five-levels-wildcard-one-below-apex/expected_result.nsec3 diff --git a/regression-tests/five-levels-wildcard-one-below-apex/skip.nodnssec b/regression-tests/tests/five-levels-wildcard-one-below-apex/skip.nodnssec similarity index 100% rename from regression-tests/five-levels-wildcard-one-below-apex/skip.nodnssec rename to regression-tests/tests/five-levels-wildcard-one-below-apex/skip.nodnssec diff --git a/regression-tests/five-levels-wildcard/command b/regression-tests/tests/five-levels-wildcard/command similarity index 100% rename from regression-tests/five-levels-wildcard/command rename to regression-tests/tests/five-levels-wildcard/command diff --git a/regression-tests/five-levels-wildcard/description b/regression-tests/tests/five-levels-wildcard/description similarity index 100% rename from regression-tests/five-levels-wildcard/description rename to regression-tests/tests/five-levels-wildcard/description diff --git a/regression-tests/five-levels-wildcard/expected_result b/regression-tests/tests/five-levels-wildcard/expected_result similarity index 100% rename from regression-tests/five-levels-wildcard/expected_result rename to regression-tests/tests/five-levels-wildcard/expected_result diff --git a/regression-tests/five-levels-wildcard/expected_result.narrow b/regression-tests/tests/five-levels-wildcard/expected_result.narrow similarity index 100% rename from regression-tests/five-levels-wildcard/expected_result.narrow rename to regression-tests/tests/five-levels-wildcard/expected_result.narrow diff --git a/regression-tests/five-levels-wildcard/expected_result.nsec3 b/regression-tests/tests/five-levels-wildcard/expected_result.nsec3 similarity index 100% rename from regression-tests/five-levels-wildcard/expected_result.nsec3 rename to regression-tests/tests/five-levels-wildcard/expected_result.nsec3 diff --git a/regression-tests/five-levels-wildcard/skip.nodnssec b/regression-tests/tests/five-levels-wildcard/skip.nodnssec similarity index 100% rename from regression-tests/five-levels-wildcard/skip.nodnssec rename to regression-tests/tests/five-levels-wildcard/skip.nodnssec diff --git a/regression-tests/glue-record/command b/regression-tests/tests/glue-record/command similarity index 100% rename from regression-tests/glue-record/command rename to regression-tests/tests/glue-record/command diff --git a/regression-tests/glue-record/description b/regression-tests/tests/glue-record/description similarity index 100% rename from regression-tests/glue-record/description rename to regression-tests/tests/glue-record/description diff --git a/regression-tests/glue-record/expected_result b/regression-tests/tests/glue-record/expected_result similarity index 100% rename from regression-tests/glue-record/expected_result rename to regression-tests/tests/glue-record/expected_result diff --git a/regression-tests/glue-record/skip-unboundhost b/regression-tests/tests/glue-record/skip-unboundhost similarity index 100% rename from regression-tests/glue-record/skip-unboundhost rename to regression-tests/tests/glue-record/skip-unboundhost diff --git a/regression-tests/glue-referral/command b/regression-tests/tests/glue-referral/command similarity index 100% rename from regression-tests/glue-referral/command rename to regression-tests/tests/glue-referral/command diff --git a/regression-tests/glue-referral/description b/regression-tests/tests/glue-referral/description similarity index 100% rename from regression-tests/glue-referral/description rename to regression-tests/tests/glue-referral/description diff --git a/regression-tests/glue-referral/expected_result b/regression-tests/tests/glue-referral/expected_result similarity index 100% rename from regression-tests/glue-referral/expected_result rename to regression-tests/tests/glue-referral/expected_result diff --git a/regression-tests/glue-referral/skip-unboundhost b/regression-tests/tests/glue-referral/skip-unboundhost similarity index 100% rename from regression-tests/glue-referral/skip-unboundhost rename to regression-tests/tests/glue-referral/skip-unboundhost diff --git a/regression-tests/internal-referral/command b/regression-tests/tests/internal-referral/command similarity index 100% rename from regression-tests/internal-referral/command rename to regression-tests/tests/internal-referral/command diff --git a/regression-tests/internal-referral/description b/regression-tests/tests/internal-referral/description similarity index 100% rename from regression-tests/internal-referral/description rename to regression-tests/tests/internal-referral/description diff --git a/regression-tests/internal-referral/expected_result b/regression-tests/tests/internal-referral/expected_result similarity index 100% rename from regression-tests/internal-referral/expected_result rename to regression-tests/tests/internal-referral/expected_result diff --git a/regression-tests/internal-referral/skip-unboundhost b/regression-tests/tests/internal-referral/skip-unboundhost similarity index 100% rename from regression-tests/internal-referral/skip-unboundhost rename to regression-tests/tests/internal-referral/skip-unboundhost diff --git a/regression-tests/long-name/command b/regression-tests/tests/long-name/command similarity index 100% rename from regression-tests/long-name/command rename to regression-tests/tests/long-name/command diff --git a/regression-tests/long-name/description b/regression-tests/tests/long-name/description similarity index 100% rename from regression-tests/long-name/description rename to regression-tests/tests/long-name/description diff --git a/regression-tests/long-name/expected_result b/regression-tests/tests/long-name/expected_result similarity index 100% rename from regression-tests/long-name/expected_result rename to regression-tests/tests/long-name/expected_result diff --git a/regression-tests/mboxfw-record/command b/regression-tests/tests/mboxfw-record/command similarity index 100% rename from regression-tests/mboxfw-record/command rename to regression-tests/tests/mboxfw-record/command diff --git a/regression-tests/mboxfw-record/description b/regression-tests/tests/mboxfw-record/description similarity index 100% rename from regression-tests/mboxfw-record/description rename to regression-tests/tests/mboxfw-record/description diff --git a/regression-tests/mboxfw-record/expected_result b/regression-tests/tests/mboxfw-record/expected_result similarity index 100% rename from regression-tests/mboxfw-record/expected_result rename to regression-tests/tests/mboxfw-record/expected_result diff --git a/regression-tests/mboxfw-record/skip b/regression-tests/tests/mboxfw-record/skip similarity index 100% rename from regression-tests/mboxfw-record/skip rename to regression-tests/tests/mboxfw-record/skip diff --git a/regression-tests/minimal-noerror/command b/regression-tests/tests/minimal-noerror/command similarity index 100% rename from regression-tests/minimal-noerror/command rename to regression-tests/tests/minimal-noerror/command diff --git a/regression-tests/minimal-noerror/description b/regression-tests/tests/minimal-noerror/description similarity index 100% rename from regression-tests/minimal-noerror/description rename to regression-tests/tests/minimal-noerror/description diff --git a/regression-tests/minimal-noerror/expected_result b/regression-tests/tests/minimal-noerror/expected_result similarity index 100% rename from regression-tests/minimal-noerror/expected_result rename to regression-tests/tests/minimal-noerror/expected_result diff --git a/regression-tests/minimal-noerror/expected_result.narrow b/regression-tests/tests/minimal-noerror/expected_result.narrow similarity index 100% rename from regression-tests/minimal-noerror/expected_result.narrow rename to regression-tests/tests/minimal-noerror/expected_result.narrow diff --git a/regression-tests/minimal-noerror/expected_result.nsec3 b/regression-tests/tests/minimal-noerror/expected_result.nsec3 similarity index 100% rename from regression-tests/minimal-noerror/expected_result.nsec3 rename to regression-tests/tests/minimal-noerror/expected_result.nsec3 diff --git a/regression-tests/minimal-noerror/skip.nodnssec b/regression-tests/tests/minimal-noerror/skip.nodnssec similarity index 100% rename from regression-tests/minimal-noerror/skip.nodnssec rename to regression-tests/tests/minimal-noerror/skip.nodnssec diff --git a/regression-tests/minimal-nxdomain/command b/regression-tests/tests/minimal-nxdomain/command similarity index 100% rename from regression-tests/minimal-nxdomain/command rename to regression-tests/tests/minimal-nxdomain/command diff --git a/regression-tests/minimal-nxdomain/description b/regression-tests/tests/minimal-nxdomain/description similarity index 100% rename from regression-tests/minimal-nxdomain/description rename to regression-tests/tests/minimal-nxdomain/description diff --git a/regression-tests/minimal-nxdomain/expected_result b/regression-tests/tests/minimal-nxdomain/expected_result similarity index 100% rename from regression-tests/minimal-nxdomain/expected_result rename to regression-tests/tests/minimal-nxdomain/expected_result diff --git a/regression-tests/minimal-nxdomain/expected_result.narrow b/regression-tests/tests/minimal-nxdomain/expected_result.narrow similarity index 100% rename from regression-tests/minimal-nxdomain/expected_result.narrow rename to regression-tests/tests/minimal-nxdomain/expected_result.narrow diff --git a/regression-tests/minimal-nxdomain/expected_result.nsec3 b/regression-tests/tests/minimal-nxdomain/expected_result.nsec3 similarity index 100% rename from regression-tests/minimal-nxdomain/expected_result.nsec3 rename to regression-tests/tests/minimal-nxdomain/expected_result.nsec3 diff --git a/regression-tests/minimal-nxdomain/skip.nodnssec b/regression-tests/tests/minimal-nxdomain/skip.nodnssec similarity index 100% rename from regression-tests/minimal-nxdomain/skip.nodnssec rename to regression-tests/tests/minimal-nxdomain/skip.nodnssec diff --git a/regression-tests/multi-step-cname-resolution/command b/regression-tests/tests/multi-step-cname-resolution/command similarity index 100% rename from regression-tests/multi-step-cname-resolution/command rename to regression-tests/tests/multi-step-cname-resolution/command diff --git a/regression-tests/multi-step-cname-resolution/description b/regression-tests/tests/multi-step-cname-resolution/description similarity index 100% rename from regression-tests/multi-step-cname-resolution/description rename to regression-tests/tests/multi-step-cname-resolution/description diff --git a/regression-tests/multi-step-cname-resolution/expected_result b/regression-tests/tests/multi-step-cname-resolution/expected_result similarity index 100% rename from regression-tests/multi-step-cname-resolution/expected_result rename to regression-tests/tests/multi-step-cname-resolution/expected_result diff --git a/regression-tests/multi-txt-escape-resolution/command b/regression-tests/tests/multi-txt-escape-resolution/command similarity index 100% rename from regression-tests/multi-txt-escape-resolution/command rename to regression-tests/tests/multi-txt-escape-resolution/command diff --git a/regression-tests/multi-txt-escape-resolution/description b/regression-tests/tests/multi-txt-escape-resolution/description similarity index 100% rename from regression-tests/multi-txt-escape-resolution/description rename to regression-tests/tests/multi-txt-escape-resolution/description diff --git a/regression-tests/multi-txt-escape-resolution/expected_result b/regression-tests/tests/multi-txt-escape-resolution/expected_result similarity index 100% rename from regression-tests/multi-txt-escape-resolution/expected_result rename to regression-tests/tests/multi-txt-escape-resolution/expected_result diff --git a/regression-tests/multi-txt-resolution/command b/regression-tests/tests/multi-txt-resolution/command similarity index 100% rename from regression-tests/multi-txt-resolution/command rename to regression-tests/tests/multi-txt-resolution/command diff --git a/regression-tests/multi-txt-resolution/description b/regression-tests/tests/multi-txt-resolution/description similarity index 100% rename from regression-tests/multi-txt-resolution/description rename to regression-tests/tests/multi-txt-resolution/description diff --git a/regression-tests/multi-txt-resolution/expected_result b/regression-tests/tests/multi-txt-resolution/expected_result similarity index 100% rename from regression-tests/multi-txt-resolution/expected_result rename to regression-tests/tests/multi-txt-resolution/expected_result diff --git a/regression-tests/mx-case-sensitivy-with-ap/command b/regression-tests/tests/mx-case-sensitivy-with-ap/command similarity index 100% rename from regression-tests/mx-case-sensitivy-with-ap/command rename to regression-tests/tests/mx-case-sensitivy-with-ap/command diff --git a/regression-tests/mx-case-sensitivy-with-ap/description b/regression-tests/tests/mx-case-sensitivy-with-ap/description similarity index 100% rename from regression-tests/mx-case-sensitivy-with-ap/description rename to regression-tests/tests/mx-case-sensitivy-with-ap/description diff --git a/regression-tests/mx-case-sensitivy-with-ap/expected_result b/regression-tests/tests/mx-case-sensitivy-with-ap/expected_result similarity index 100% rename from regression-tests/mx-case-sensitivy-with-ap/expected_result rename to regression-tests/tests/mx-case-sensitivy-with-ap/expected_result diff --git a/regression-tests/mx-to-cname/command b/regression-tests/tests/mx-to-cname/command similarity index 100% rename from regression-tests/mx-to-cname/command rename to regression-tests/tests/mx-to-cname/command diff --git a/regression-tests/mx-to-cname/description b/regression-tests/tests/mx-to-cname/description similarity index 100% rename from regression-tests/mx-to-cname/description rename to regression-tests/tests/mx-to-cname/description diff --git a/regression-tests/mx-to-cname/expected_result b/regression-tests/tests/mx-to-cname/expected_result similarity index 100% rename from regression-tests/mx-to-cname/expected_result rename to regression-tests/tests/mx-to-cname/expected_result diff --git a/regression-tests/mx-with-simple-additional-processing/command b/regression-tests/tests/mx-with-simple-additional-processing/command similarity index 100% rename from regression-tests/mx-with-simple-additional-processing/command rename to regression-tests/tests/mx-with-simple-additional-processing/command diff --git a/regression-tests/mx-with-simple-additional-processing/description b/regression-tests/tests/mx-with-simple-additional-processing/description similarity index 100% rename from regression-tests/mx-with-simple-additional-processing/description rename to regression-tests/tests/mx-with-simple-additional-processing/description diff --git a/regression-tests/mx-with-simple-additional-processing/expected_result b/regression-tests/tests/mx-with-simple-additional-processing/expected_result similarity index 100% rename from regression-tests/mx-with-simple-additional-processing/expected_result rename to regression-tests/tests/mx-with-simple-additional-processing/expected_result diff --git a/regression-tests/naptr/command b/regression-tests/tests/naptr/command similarity index 100% rename from regression-tests/naptr/command rename to regression-tests/tests/naptr/command diff --git a/regression-tests/naptr/description b/regression-tests/tests/naptr/description similarity index 100% rename from regression-tests/naptr/description rename to regression-tests/tests/naptr/description diff --git a/regression-tests/naptr/expected_result b/regression-tests/tests/naptr/expected_result similarity index 100% rename from regression-tests/naptr/expected_result rename to regression-tests/tests/naptr/expected_result diff --git a/regression-tests/non-existing-record-other-types-exist-ns/command b/regression-tests/tests/non-existing-record-other-types-exist-ns/command similarity index 100% rename from regression-tests/non-existing-record-other-types-exist-ns/command rename to regression-tests/tests/non-existing-record-other-types-exist-ns/command diff --git a/regression-tests/non-existing-record-other-types-exist-ns/description b/regression-tests/tests/non-existing-record-other-types-exist-ns/description similarity index 100% rename from regression-tests/non-existing-record-other-types-exist-ns/description rename to regression-tests/tests/non-existing-record-other-types-exist-ns/description diff --git a/regression-tests/non-existing-record-other-types-exist-ns/expected_result b/regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result similarity index 100% rename from regression-tests/non-existing-record-other-types-exist-ns/expected_result rename to regression-tests/tests/non-existing-record-other-types-exist-ns/expected_result diff --git a/regression-tests/non-existing-record-other-types-exist/command b/regression-tests/tests/non-existing-record-other-types-exist/command similarity index 100% rename from regression-tests/non-existing-record-other-types-exist/command rename to regression-tests/tests/non-existing-record-other-types-exist/command diff --git a/regression-tests/non-existing-record-other-types-exist/description b/regression-tests/tests/non-existing-record-other-types-exist/description similarity index 100% rename from regression-tests/non-existing-record-other-types-exist/description rename to regression-tests/tests/non-existing-record-other-types-exist/description diff --git a/regression-tests/non-existing-record-other-types-exist/expected_result b/regression-tests/tests/non-existing-record-other-types-exist/expected_result similarity index 100% rename from regression-tests/non-existing-record-other-types-exist/expected_result rename to regression-tests/tests/non-existing-record-other-types-exist/expected_result diff --git a/regression-tests/ns-at-delegation/command b/regression-tests/tests/ns-at-delegation/command similarity index 100% rename from regression-tests/ns-at-delegation/command rename to regression-tests/tests/ns-at-delegation/command diff --git a/regression-tests/ns-at-delegation/description b/regression-tests/tests/ns-at-delegation/description similarity index 100% rename from regression-tests/ns-at-delegation/description rename to regression-tests/tests/ns-at-delegation/description diff --git a/regression-tests/ns-at-delegation/expected_result b/regression-tests/tests/ns-at-delegation/expected_result similarity index 100% rename from regression-tests/ns-at-delegation/expected_result rename to regression-tests/tests/ns-at-delegation/expected_result diff --git a/regression-tests/ns-at-delegation/skip-unboundhost b/regression-tests/tests/ns-at-delegation/skip-unboundhost similarity index 100% rename from regression-tests/ns-at-delegation/skip-unboundhost rename to regression-tests/tests/ns-at-delegation/skip-unboundhost diff --git a/regression-tests/ns-with-identical-glue/command b/regression-tests/tests/ns-with-identical-glue/command similarity index 100% rename from regression-tests/ns-with-identical-glue/command rename to regression-tests/tests/ns-with-identical-glue/command diff --git a/regression-tests/ns-with-identical-glue/description b/regression-tests/tests/ns-with-identical-glue/description similarity index 100% rename from regression-tests/ns-with-identical-glue/description rename to regression-tests/tests/ns-with-identical-glue/description diff --git a/regression-tests/ns-with-identical-glue/expected_result b/regression-tests/tests/ns-with-identical-glue/expected_result similarity index 100% rename from regression-tests/ns-with-identical-glue/expected_result rename to regression-tests/tests/ns-with-identical-glue/expected_result diff --git a/regression-tests/ns-with-identical-glue/skip-unboundhost b/regression-tests/tests/ns-with-identical-glue/skip-unboundhost similarity index 100% rename from regression-tests/ns-with-identical-glue/skip-unboundhost rename to regression-tests/tests/ns-with-identical-glue/skip-unboundhost diff --git a/regression-tests/nsec-bitmap/command b/regression-tests/tests/nsec-bitmap/command similarity index 100% rename from regression-tests/nsec-bitmap/command rename to regression-tests/tests/nsec-bitmap/command diff --git a/regression-tests/nsec-bitmap/description b/regression-tests/tests/nsec-bitmap/description similarity index 100% rename from regression-tests/nsec-bitmap/description rename to regression-tests/tests/nsec-bitmap/description diff --git a/regression-tests/nsec-bitmap/expected_result b/regression-tests/tests/nsec-bitmap/expected_result similarity index 100% rename from regression-tests/nsec-bitmap/expected_result rename to regression-tests/tests/nsec-bitmap/expected_result diff --git a/regression-tests/nsec-bitmap/expected_result.narrow b/regression-tests/tests/nsec-bitmap/expected_result.narrow similarity index 100% rename from regression-tests/nsec-bitmap/expected_result.narrow rename to regression-tests/tests/nsec-bitmap/expected_result.narrow diff --git a/regression-tests/nsec-bitmap/expected_result.nsec3 b/regression-tests/tests/nsec-bitmap/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-bitmap/expected_result.nsec3 rename to regression-tests/tests/nsec-bitmap/expected_result.nsec3 diff --git a/regression-tests/nsec-bitmap/skip.nodnssec b/regression-tests/tests/nsec-bitmap/skip.nodnssec similarity index 100% rename from regression-tests/nsec-bitmap/skip.nodnssec rename to regression-tests/tests/nsec-bitmap/skip.nodnssec diff --git a/regression-tests/nsec-glue-at-delegation/command b/regression-tests/tests/nsec-glue-at-delegation/command similarity index 100% rename from regression-tests/nsec-glue-at-delegation/command rename to regression-tests/tests/nsec-glue-at-delegation/command diff --git a/regression-tests/nsec-glue-at-delegation/description b/regression-tests/tests/nsec-glue-at-delegation/description similarity index 100% rename from regression-tests/nsec-glue-at-delegation/description rename to regression-tests/tests/nsec-glue-at-delegation/description diff --git a/regression-tests/nsec-glue-at-delegation/expected_result b/regression-tests/tests/nsec-glue-at-delegation/expected_result similarity index 100% rename from regression-tests/nsec-glue-at-delegation/expected_result rename to regression-tests/tests/nsec-glue-at-delegation/expected_result diff --git a/regression-tests/nsec-glue-at-delegation/expected_result.narrow b/regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow similarity index 100% rename from regression-tests/nsec-glue-at-delegation/expected_result.narrow rename to regression-tests/tests/nsec-glue-at-delegation/expected_result.narrow diff --git a/regression-tests/nsec-glue-at-delegation/expected_result.nsec3 b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-glue-at-delegation/expected_result.nsec3 rename to regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3 diff --git a/regression-tests/nsec-glue-at-delegation/expected_result.nsec3-optout b/regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout similarity index 100% rename from regression-tests/nsec-glue-at-delegation/expected_result.nsec3-optout rename to regression-tests/tests/nsec-glue-at-delegation/expected_result.nsec3-optout diff --git a/regression-tests/nsec-glue-at-delegation/skip.nodnssec b/regression-tests/tests/nsec-glue-at-delegation/skip.nodnssec similarity index 100% rename from regression-tests/nsec-glue-at-delegation/skip.nodnssec rename to regression-tests/tests/nsec-glue-at-delegation/skip.nodnssec diff --git a/regression-tests/nsec-glue-at-delegation/skip.oracle-nsec b/regression-tests/tests/nsec-glue-at-delegation/skip.oracle-nsec similarity index 100% rename from regression-tests/nsec-glue-at-delegation/skip.oracle-nsec rename to regression-tests/tests/nsec-glue-at-delegation/skip.oracle-nsec diff --git a/regression-tests/nsec-glue-at-delegation/skip.oracle-nsec3 b/regression-tests/tests/nsec-glue-at-delegation/skip.oracle-nsec3 similarity index 100% rename from regression-tests/nsec-glue-at-delegation/skip.oracle-nsec3 rename to regression-tests/tests/nsec-glue-at-delegation/skip.oracle-nsec3 diff --git a/regression-tests/nsec-glue/command b/regression-tests/tests/nsec-glue/command similarity index 100% rename from regression-tests/nsec-glue/command rename to regression-tests/tests/nsec-glue/command diff --git a/regression-tests/nsec-glue/description b/regression-tests/tests/nsec-glue/description similarity index 100% rename from regression-tests/nsec-glue/description rename to regression-tests/tests/nsec-glue/description diff --git a/regression-tests/nsec-glue/expected_result b/regression-tests/tests/nsec-glue/expected_result similarity index 100% rename from regression-tests/nsec-glue/expected_result rename to regression-tests/tests/nsec-glue/expected_result diff --git a/regression-tests/nsec-glue/expected_result.narrow b/regression-tests/tests/nsec-glue/expected_result.narrow similarity index 100% rename from regression-tests/nsec-glue/expected_result.narrow rename to regression-tests/tests/nsec-glue/expected_result.narrow diff --git a/regression-tests/nsec-glue/expected_result.nsec3 b/regression-tests/tests/nsec-glue/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-glue/expected_result.nsec3 rename to regression-tests/tests/nsec-glue/expected_result.nsec3 diff --git a/regression-tests/nsec-glue/skip.nodnssec b/regression-tests/tests/nsec-glue/skip.nodnssec similarity index 100% rename from regression-tests/nsec-glue/skip.nodnssec rename to regression-tests/tests/nsec-glue/skip.nodnssec diff --git a/regression-tests/nsec-glue/skip.oracle-nsec b/regression-tests/tests/nsec-glue/skip.oracle-nsec similarity index 100% rename from regression-tests/nsec-glue/skip.oracle-nsec rename to regression-tests/tests/nsec-glue/skip.oracle-nsec diff --git a/regression-tests/nsec-middle/command b/regression-tests/tests/nsec-middle/command similarity index 100% rename from regression-tests/nsec-middle/command rename to regression-tests/tests/nsec-middle/command diff --git a/regression-tests/nsec-middle/description b/regression-tests/tests/nsec-middle/description similarity index 100% rename from regression-tests/nsec-middle/description rename to regression-tests/tests/nsec-middle/description diff --git a/regression-tests/nsec-middle/expected_result b/regression-tests/tests/nsec-middle/expected_result similarity index 100% rename from regression-tests/nsec-middle/expected_result rename to regression-tests/tests/nsec-middle/expected_result diff --git a/regression-tests/nsec-middle/expected_result.narrow b/regression-tests/tests/nsec-middle/expected_result.narrow similarity index 100% rename from regression-tests/nsec-middle/expected_result.narrow rename to regression-tests/tests/nsec-middle/expected_result.narrow diff --git a/regression-tests/nsec-middle/expected_result.nsec3 b/regression-tests/tests/nsec-middle/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-middle/expected_result.nsec3 rename to regression-tests/tests/nsec-middle/expected_result.nsec3 diff --git a/regression-tests/nsec-middle/skip.nodnssec b/regression-tests/tests/nsec-middle/skip.nodnssec similarity index 100% rename from regression-tests/nsec-middle/skip.nodnssec rename to regression-tests/tests/nsec-middle/skip.nodnssec diff --git a/regression-tests/nsec-wildcard/command b/regression-tests/tests/nsec-wildcard/command similarity index 100% rename from regression-tests/nsec-wildcard/command rename to regression-tests/tests/nsec-wildcard/command diff --git a/regression-tests/nsec-wildcard/description b/regression-tests/tests/nsec-wildcard/description similarity index 100% rename from regression-tests/nsec-wildcard/description rename to regression-tests/tests/nsec-wildcard/description diff --git a/regression-tests/nsec-wildcard/expected_result b/regression-tests/tests/nsec-wildcard/expected_result similarity index 100% rename from regression-tests/nsec-wildcard/expected_result rename to regression-tests/tests/nsec-wildcard/expected_result diff --git a/regression-tests/nsec-wildcard/expected_result.narrow b/regression-tests/tests/nsec-wildcard/expected_result.narrow similarity index 100% rename from regression-tests/nsec-wildcard/expected_result.narrow rename to regression-tests/tests/nsec-wildcard/expected_result.narrow diff --git a/regression-tests/nsec-wildcard/expected_result.nsec3 b/regression-tests/tests/nsec-wildcard/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-wildcard/expected_result.nsec3 rename to regression-tests/tests/nsec-wildcard/expected_result.nsec3 diff --git a/regression-tests/nsec-wildcard/skip.nodnssec b/regression-tests/tests/nsec-wildcard/skip.nodnssec similarity index 100% rename from regression-tests/nsec-wildcard/skip.nodnssec rename to regression-tests/tests/nsec-wildcard/skip.nodnssec diff --git a/regression-tests/nsec-wraparound/command b/regression-tests/tests/nsec-wraparound/command similarity index 100% rename from regression-tests/nsec-wraparound/command rename to regression-tests/tests/nsec-wraparound/command diff --git a/regression-tests/nsec-wraparound/description b/regression-tests/tests/nsec-wraparound/description similarity index 100% rename from regression-tests/nsec-wraparound/description rename to regression-tests/tests/nsec-wraparound/description diff --git a/regression-tests/nsec-wraparound/expected_result b/regression-tests/tests/nsec-wraparound/expected_result similarity index 100% rename from regression-tests/nsec-wraparound/expected_result rename to regression-tests/tests/nsec-wraparound/expected_result diff --git a/regression-tests/nsec-wraparound/expected_result.nsec3 b/regression-tests/tests/nsec-wraparound/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-wraparound/expected_result.nsec3 rename to regression-tests/tests/nsec-wraparound/expected_result.nsec3 diff --git a/regression-tests/nsec-wraparound/skip.narrow b/regression-tests/tests/nsec-wraparound/skip.narrow similarity index 100% rename from regression-tests/nsec-wraparound/skip.narrow rename to regression-tests/tests/nsec-wraparound/skip.narrow diff --git a/regression-tests/nsec-wraparound/skip.nodnssec b/regression-tests/tests/nsec-wraparound/skip.nodnssec similarity index 100% rename from regression-tests/nsec-wraparound/skip.nodnssec rename to regression-tests/tests/nsec-wraparound/skip.nodnssec diff --git a/regression-tests/nsec-wraparound/skip.nsec3 b/regression-tests/tests/nsec-wraparound/skip.nsec3 similarity index 100% rename from regression-tests/nsec-wraparound/skip.nsec3 rename to regression-tests/tests/nsec-wraparound/skip.nsec3 diff --git a/regression-tests/nsec-wrong-type-at-apex/command b/regression-tests/tests/nsec-wrong-type-at-apex/command similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/command rename to regression-tests/tests/nsec-wrong-type-at-apex/command diff --git a/regression-tests/nsec-wrong-type-at-apex/description b/regression-tests/tests/nsec-wrong-type-at-apex/description similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/description rename to regression-tests/tests/nsec-wrong-type-at-apex/description diff --git a/regression-tests/nsec-wrong-type-at-apex/expected_result b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/expected_result rename to regression-tests/tests/nsec-wrong-type-at-apex/expected_result diff --git a/regression-tests/nsec-wrong-type-at-apex/expected_result.narrow b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/expected_result.narrow rename to regression-tests/tests/nsec-wrong-type-at-apex/expected_result.narrow diff --git a/regression-tests/nsec-wrong-type-at-apex/expected_result.nsec3 b/regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/expected_result.nsec3 rename to regression-tests/tests/nsec-wrong-type-at-apex/expected_result.nsec3 diff --git a/regression-tests/nsec-wrong-type-at-apex/skip.nodnssec b/regression-tests/tests/nsec-wrong-type-at-apex/skip.nodnssec similarity index 100% rename from regression-tests/nsec-wrong-type-at-apex/skip.nodnssec rename to regression-tests/tests/nsec-wrong-type-at-apex/skip.nodnssec diff --git a/regression-tests/nsec-wrong-type/command b/regression-tests/tests/nsec-wrong-type/command similarity index 100% rename from regression-tests/nsec-wrong-type/command rename to regression-tests/tests/nsec-wrong-type/command diff --git a/regression-tests/nsec-wrong-type/description b/regression-tests/tests/nsec-wrong-type/description similarity index 100% rename from regression-tests/nsec-wrong-type/description rename to regression-tests/tests/nsec-wrong-type/description diff --git a/regression-tests/nsec-wrong-type/expected_result b/regression-tests/tests/nsec-wrong-type/expected_result similarity index 100% rename from regression-tests/nsec-wrong-type/expected_result rename to regression-tests/tests/nsec-wrong-type/expected_result diff --git a/regression-tests/nsec-wrong-type/expected_result.narrow b/regression-tests/tests/nsec-wrong-type/expected_result.narrow similarity index 100% rename from regression-tests/nsec-wrong-type/expected_result.narrow rename to regression-tests/tests/nsec-wrong-type/expected_result.narrow diff --git a/regression-tests/nsec-wrong-type/expected_result.nsec3 b/regression-tests/tests/nsec-wrong-type/expected_result.nsec3 similarity index 100% rename from regression-tests/nsec-wrong-type/expected_result.nsec3 rename to regression-tests/tests/nsec-wrong-type/expected_result.nsec3 diff --git a/regression-tests/nsec-wrong-type/skip.nodnssec b/regression-tests/tests/nsec-wrong-type/skip.nodnssec similarity index 100% rename from regression-tests/nsec-wrong-type/skip.nodnssec rename to regression-tests/tests/nsec-wrong-type/skip.nodnssec diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/command b/regression-tests/tests/nsecx-mode2-wildcard-nodata/command similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/command rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/command diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/description b/regression-tests/tests/nsecx-mode2-wildcard-nodata/description similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/description rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/description diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/expected_result b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/expected_result rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/expected_result.narrow b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/expected_result.narrow rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.narrow diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 b/regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/expected_result.nsec3 diff --git a/regression-tests/nsecx-mode2-wildcard-nodata/skip.nodnssec b/regression-tests/tests/nsecx-mode2-wildcard-nodata/skip.nodnssec similarity index 100% rename from regression-tests/nsecx-mode2-wildcard-nodata/skip.nodnssec rename to regression-tests/tests/nsecx-mode2-wildcard-nodata/skip.nodnssec diff --git a/regression-tests/nsecx-mode3-wildcard/command b/regression-tests/tests/nsecx-mode3-wildcard/command similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/command rename to regression-tests/tests/nsecx-mode3-wildcard/command diff --git a/regression-tests/nsecx-mode3-wildcard/description b/regression-tests/tests/nsecx-mode3-wildcard/description similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/description rename to regression-tests/tests/nsecx-mode3-wildcard/description diff --git a/regression-tests/nsecx-mode3-wildcard/expected_result b/regression-tests/tests/nsecx-mode3-wildcard/expected_result similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/expected_result rename to regression-tests/tests/nsecx-mode3-wildcard/expected_result diff --git a/regression-tests/nsecx-mode3-wildcard/expected_result.narrow b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/expected_result.narrow rename to regression-tests/tests/nsecx-mode3-wildcard/expected_result.narrow diff --git a/regression-tests/nsecx-mode3-wildcard/expected_result.nsec3 b/regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3 similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/expected_result.nsec3 rename to regression-tests/tests/nsecx-mode3-wildcard/expected_result.nsec3 diff --git a/regression-tests/nsecx-mode3-wildcard/skip.nodnssec b/regression-tests/tests/nsecx-mode3-wildcard/skip.nodnssec similarity index 100% rename from regression-tests/nsecx-mode3-wildcard/skip.nodnssec rename to regression-tests/tests/nsecx-mode3-wildcard/skip.nodnssec diff --git a/regression-tests/nxdomain-below-nonempty-terminal/command b/regression-tests/tests/nxdomain-below-nonempty-terminal/command similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/command rename to regression-tests/tests/nxdomain-below-nonempty-terminal/command diff --git a/regression-tests/nxdomain-below-nonempty-terminal/description b/regression-tests/tests/nxdomain-below-nonempty-terminal/description similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/description rename to regression-tests/tests/nxdomain-below-nonempty-terminal/description diff --git a/regression-tests/nxdomain-below-nonempty-terminal/expected_result b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/expected_result rename to regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result diff --git a/regression-tests/nxdomain-below-nonempty-terminal/expected_result.narrow b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/expected_result.narrow rename to regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.narrow diff --git a/regression-tests/nxdomain-below-nonempty-terminal/expected_result.nsec3 b/regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3 similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/expected_result.nsec3 rename to regression-tests/tests/nxdomain-below-nonempty-terminal/expected_result.nsec3 diff --git a/regression-tests/nxdomain-below-nonempty-terminal/skip.nodnssec b/regression-tests/tests/nxdomain-below-nonempty-terminal/skip.nodnssec similarity index 100% rename from regression-tests/nxdomain-below-nonempty-terminal/skip.nodnssec rename to regression-tests/tests/nxdomain-below-nonempty-terminal/skip.nodnssec diff --git a/regression-tests/nxdomain-for-unknown-record/command b/regression-tests/tests/nxdomain-for-unknown-record/command similarity index 100% rename from regression-tests/nxdomain-for-unknown-record/command rename to regression-tests/tests/nxdomain-for-unknown-record/command diff --git a/regression-tests/nxdomain-for-unknown-record/description b/regression-tests/tests/nxdomain-for-unknown-record/description similarity index 100% rename from regression-tests/nxdomain-for-unknown-record/description rename to regression-tests/tests/nxdomain-for-unknown-record/description diff --git a/regression-tests/nxdomain-for-unknown-record/expected_result b/regression-tests/tests/nxdomain-for-unknown-record/expected_result similarity index 100% rename from regression-tests/nxdomain-for-unknown-record/expected_result rename to regression-tests/tests/nxdomain-for-unknown-record/expected_result diff --git a/regression-tests/obscured-wildcard/command b/regression-tests/tests/obscured-wildcard/command similarity index 100% rename from regression-tests/obscured-wildcard/command rename to regression-tests/tests/obscured-wildcard/command diff --git a/regression-tests/obscured-wildcard/description b/regression-tests/tests/obscured-wildcard/description similarity index 100% rename from regression-tests/obscured-wildcard/description rename to regression-tests/tests/obscured-wildcard/description diff --git a/regression-tests/obscured-wildcard/expected_result b/regression-tests/tests/obscured-wildcard/expected_result similarity index 100% rename from regression-tests/obscured-wildcard/expected_result rename to regression-tests/tests/obscured-wildcard/expected_result diff --git a/regression-tests/one-step-cname-resolution/command b/regression-tests/tests/one-step-cname-resolution/command similarity index 100% rename from regression-tests/one-step-cname-resolution/command rename to regression-tests/tests/one-step-cname-resolution/command diff --git a/regression-tests/one-step-cname-resolution/description b/regression-tests/tests/one-step-cname-resolution/description similarity index 100% rename from regression-tests/one-step-cname-resolution/description rename to regression-tests/tests/one-step-cname-resolution/description diff --git a/regression-tests/one-step-cname-resolution/expected_result b/regression-tests/tests/one-step-cname-resolution/expected_result similarity index 100% rename from regression-tests/one-step-cname-resolution/expected_result rename to regression-tests/tests/one-step-cname-resolution/expected_result diff --git a/regression-tests/out-of-bailiwick-referral/command b/regression-tests/tests/out-of-bailiwick-referral/command similarity index 100% rename from regression-tests/out-of-bailiwick-referral/command rename to regression-tests/tests/out-of-bailiwick-referral/command diff --git a/regression-tests/out-of-bailiwick-referral/description b/regression-tests/tests/out-of-bailiwick-referral/description similarity index 100% rename from regression-tests/out-of-bailiwick-referral/description rename to regression-tests/tests/out-of-bailiwick-referral/description diff --git a/regression-tests/out-of-bailiwick-referral/expected_result b/regression-tests/tests/out-of-bailiwick-referral/expected_result similarity index 100% rename from regression-tests/out-of-bailiwick-referral/expected_result rename to regression-tests/tests/out-of-bailiwick-referral/expected_result diff --git a/regression-tests/out-of-bailiwick-referral/skip-unboundhost b/regression-tests/tests/out-of-bailiwick-referral/skip-unboundhost similarity index 100% rename from regression-tests/out-of-bailiwick-referral/skip-unboundhost rename to regression-tests/tests/out-of-bailiwick-referral/skip-unboundhost diff --git a/regression-tests/pretty-big-packet/command b/regression-tests/tests/pretty-big-packet/command similarity index 100% rename from regression-tests/pretty-big-packet/command rename to regression-tests/tests/pretty-big-packet/command diff --git a/regression-tests/pretty-big-packet/description b/regression-tests/tests/pretty-big-packet/description similarity index 100% rename from regression-tests/pretty-big-packet/description rename to regression-tests/tests/pretty-big-packet/description diff --git a/regression-tests/pretty-big-packet/expected_result b/regression-tests/tests/pretty-big-packet/expected_result similarity index 100% rename from regression-tests/pretty-big-packet/expected_result rename to regression-tests/tests/pretty-big-packet/expected_result diff --git a/regression-tests/root-srv/command b/regression-tests/tests/root-srv/command similarity index 100% rename from regression-tests/root-srv/command rename to regression-tests/tests/root-srv/command diff --git a/regression-tests/root-srv/description b/regression-tests/tests/root-srv/description similarity index 100% rename from regression-tests/root-srv/description rename to regression-tests/tests/root-srv/description diff --git a/regression-tests/root-srv/expected_result b/regression-tests/tests/root-srv/expected_result similarity index 100% rename from regression-tests/root-srv/expected_result rename to regression-tests/tests/root-srv/expected_result diff --git a/regression-tests/rp/command b/regression-tests/tests/rp/command similarity index 100% rename from regression-tests/rp/command rename to regression-tests/tests/rp/command diff --git a/regression-tests/rp/description b/regression-tests/tests/rp/description similarity index 100% rename from regression-tests/rp/description rename to regression-tests/tests/rp/description diff --git a/regression-tests/rp/expected_result b/regression-tests/tests/rp/expected_result similarity index 100% rename from regression-tests/rp/expected_result rename to regression-tests/tests/rp/expected_result diff --git a/regression-tests/same-level-referral-soa/command b/regression-tests/tests/same-level-referral-soa/command similarity index 100% rename from regression-tests/same-level-referral-soa/command rename to regression-tests/tests/same-level-referral-soa/command diff --git a/regression-tests/same-level-referral-soa/description b/regression-tests/tests/same-level-referral-soa/description similarity index 100% rename from regression-tests/same-level-referral-soa/description rename to regression-tests/tests/same-level-referral-soa/description diff --git a/regression-tests/same-level-referral-soa/expected_result b/regression-tests/tests/same-level-referral-soa/expected_result similarity index 100% rename from regression-tests/same-level-referral-soa/expected_result rename to regression-tests/tests/same-level-referral-soa/expected_result diff --git a/regression-tests/same-level-referral-soa/skip-unboundhost b/regression-tests/tests/same-level-referral-soa/skip-unboundhost similarity index 100% rename from regression-tests/same-level-referral-soa/skip-unboundhost rename to regression-tests/tests/same-level-referral-soa/skip-unboundhost diff --git a/regression-tests/same-level-referral/command b/regression-tests/tests/same-level-referral/command similarity index 100% rename from regression-tests/same-level-referral/command rename to regression-tests/tests/same-level-referral/command diff --git a/regression-tests/same-level-referral/description b/regression-tests/tests/same-level-referral/description similarity index 100% rename from regression-tests/same-level-referral/description rename to regression-tests/tests/same-level-referral/description diff --git a/regression-tests/same-level-referral/expected_result b/regression-tests/tests/same-level-referral/expected_result similarity index 100% rename from regression-tests/same-level-referral/expected_result rename to regression-tests/tests/same-level-referral/expected_result diff --git a/regression-tests/same-level-referral/skip-unboundhost b/regression-tests/tests/same-level-referral/skip-unboundhost similarity index 100% rename from regression-tests/same-level-referral/skip-unboundhost rename to regression-tests/tests/same-level-referral/skip-unboundhost diff --git a/regression-tests/second-level-nxdomain/command b/regression-tests/tests/second-level-nxdomain/command similarity index 100% rename from regression-tests/second-level-nxdomain/command rename to regression-tests/tests/second-level-nxdomain/command diff --git a/regression-tests/second-level-nxdomain/description b/regression-tests/tests/second-level-nxdomain/description similarity index 100% rename from regression-tests/second-level-nxdomain/description rename to regression-tests/tests/second-level-nxdomain/description diff --git a/regression-tests/second-level-nxdomain/expected_result b/regression-tests/tests/second-level-nxdomain/expected_result similarity index 100% rename from regression-tests/second-level-nxdomain/expected_result rename to regression-tests/tests/second-level-nxdomain/expected_result diff --git a/regression-tests/second-level-nxdomain/expected_result.narrow b/regression-tests/tests/second-level-nxdomain/expected_result.narrow similarity index 100% rename from regression-tests/second-level-nxdomain/expected_result.narrow rename to regression-tests/tests/second-level-nxdomain/expected_result.narrow diff --git a/regression-tests/second-level-nxdomain/expected_result.nsec3 b/regression-tests/tests/second-level-nxdomain/expected_result.nsec3 similarity index 100% rename from regression-tests/second-level-nxdomain/expected_result.nsec3 rename to regression-tests/tests/second-level-nxdomain/expected_result.nsec3 diff --git a/regression-tests/second-level-nxdomain/skip.nodnssec b/regression-tests/tests/second-level-nxdomain/skip.nodnssec similarity index 100% rename from regression-tests/second-level-nxdomain/skip.nodnssec rename to regression-tests/tests/second-level-nxdomain/skip.nodnssec diff --git a/regression-tests/secure-delegation-ds-ns/command b/regression-tests/tests/secure-delegation-ds-ns/command similarity index 100% rename from regression-tests/secure-delegation-ds-ns/command rename to regression-tests/tests/secure-delegation-ds-ns/command diff --git a/regression-tests/secure-delegation-ds-ns/description b/regression-tests/tests/secure-delegation-ds-ns/description similarity index 100% rename from regression-tests/secure-delegation-ds-ns/description rename to regression-tests/tests/secure-delegation-ds-ns/description diff --git a/regression-tests/secure-delegation-ds-ns/expected_result b/regression-tests/tests/secure-delegation-ds-ns/expected_result similarity index 100% rename from regression-tests/secure-delegation-ds-ns/expected_result rename to regression-tests/tests/secure-delegation-ds-ns/expected_result diff --git a/regression-tests/secure-delegation-ds-ns/expected_result.dnssec b/regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec similarity index 100% rename from regression-tests/secure-delegation-ds-ns/expected_result.dnssec rename to regression-tests/tests/secure-delegation-ds-ns/expected_result.dnssec diff --git a/regression-tests/secure-delegation-ds-ns/skip.oracle-nsec b/regression-tests/tests/secure-delegation-ds-ns/skip.oracle-nsec similarity index 100% rename from regression-tests/secure-delegation-ds-ns/skip.oracle-nsec rename to regression-tests/tests/secure-delegation-ds-ns/skip.oracle-nsec diff --git a/regression-tests/secure-delegation-ds-ns/skip.oracle-nsec3 b/regression-tests/tests/secure-delegation-ds-ns/skip.oracle-nsec3 similarity index 100% rename from regression-tests/secure-delegation-ds-ns/skip.oracle-nsec3 rename to regression-tests/tests/secure-delegation-ds-ns/skip.oracle-nsec3 diff --git a/regression-tests/secure-delegation/command b/regression-tests/tests/secure-delegation/command similarity index 100% rename from regression-tests/secure-delegation/command rename to regression-tests/tests/secure-delegation/command diff --git a/regression-tests/secure-delegation/description b/regression-tests/tests/secure-delegation/description similarity index 100% rename from regression-tests/secure-delegation/description rename to regression-tests/tests/secure-delegation/description diff --git a/regression-tests/secure-delegation/expected_result b/regression-tests/tests/secure-delegation/expected_result similarity index 100% rename from regression-tests/secure-delegation/expected_result rename to regression-tests/tests/secure-delegation/expected_result diff --git a/regression-tests/secure-delegation/expected_result.dnssec b/regression-tests/tests/secure-delegation/expected_result.dnssec similarity index 100% rename from regression-tests/secure-delegation/expected_result.dnssec rename to regression-tests/tests/secure-delegation/expected_result.dnssec diff --git a/regression-tests/secure-delegation/skip-drill b/regression-tests/tests/secure-delegation/skip-drill similarity index 100% rename from regression-tests/secure-delegation/skip-drill rename to regression-tests/tests/secure-delegation/skip-drill diff --git a/regression-tests/space-name/command b/regression-tests/tests/space-name/command similarity index 100% rename from regression-tests/space-name/command rename to regression-tests/tests/space-name/command diff --git a/regression-tests/space-name/description b/regression-tests/tests/space-name/description similarity index 100% rename from regression-tests/space-name/description rename to regression-tests/tests/space-name/description diff --git a/regression-tests/space-name/expected_result b/regression-tests/tests/space-name/expected_result similarity index 100% rename from regression-tests/space-name/expected_result rename to regression-tests/tests/space-name/expected_result diff --git a/regression-tests/space-name/expected_result.narrow b/regression-tests/tests/space-name/expected_result.narrow similarity index 100% rename from regression-tests/space-name/expected_result.narrow rename to regression-tests/tests/space-name/expected_result.narrow diff --git a/regression-tests/space-name/expected_result.nsec3 b/regression-tests/tests/space-name/expected_result.nsec3 similarity index 100% rename from regression-tests/space-name/expected_result.nsec3 rename to regression-tests/tests/space-name/expected_result.nsec3 diff --git a/regression-tests/space-name/skip.nodnssec b/regression-tests/tests/space-name/skip.nodnssec similarity index 100% rename from regression-tests/space-name/skip.nodnssec rename to regression-tests/tests/space-name/skip.nodnssec diff --git a/regression-tests/too-big-for-udp-query-no-truncate-additional/command b/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command similarity index 100% rename from regression-tests/too-big-for-udp-query-no-truncate-additional/command rename to regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command diff --git a/regression-tests/too-big-for-udp-query-no-truncate-additional/description b/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/description similarity index 100% rename from regression-tests/too-big-for-udp-query-no-truncate-additional/description rename to regression-tests/tests/too-big-for-udp-query-no-truncate-additional/description diff --git a/regression-tests/too-big-for-udp-query-no-truncate-additional/expected_result b/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/expected_result similarity index 100% rename from regression-tests/too-big-for-udp-query-no-truncate-additional/expected_result rename to regression-tests/tests/too-big-for-udp-query-no-truncate-additional/expected_result diff --git a/regression-tests/too-big-for-udp-query/command b/regression-tests/tests/too-big-for-udp-query/command similarity index 100% rename from regression-tests/too-big-for-udp-query/command rename to regression-tests/tests/too-big-for-udp-query/command diff --git a/regression-tests/too-big-for-udp-query/description b/regression-tests/tests/too-big-for-udp-query/description similarity index 100% rename from regression-tests/too-big-for-udp-query/description rename to regression-tests/tests/too-big-for-udp-query/description diff --git a/regression-tests/too-big-for-udp-query/expected_result b/regression-tests/tests/too-big-for-udp-query/expected_result similarity index 100% rename from regression-tests/too-big-for-udp-query/expected_result rename to regression-tests/tests/too-big-for-udp-query/expected_result diff --git a/regression-tests/tsig-axfr/command b/regression-tests/tests/tsig-axfr/command similarity index 100% rename from regression-tests/tsig-axfr/command rename to regression-tests/tests/tsig-axfr/command diff --git a/regression-tests/tsig-axfr/description b/regression-tests/tests/tsig-axfr/description similarity index 100% rename from regression-tests/tsig-axfr/description rename to regression-tests/tests/tsig-axfr/description diff --git a/regression-tests/tsig-axfr/expected_result b/regression-tests/tests/tsig-axfr/expected_result similarity index 100% rename from regression-tests/tsig-axfr/expected_result rename to regression-tests/tests/tsig-axfr/expected_result diff --git a/regression-tests/tsig-axfr/skip.narrow b/regression-tests/tests/tsig-axfr/skip.narrow similarity index 100% rename from regression-tests/tsig-axfr/skip.narrow rename to regression-tests/tests/tsig-axfr/skip.narrow diff --git a/regression-tests/tsig-axfr/skip.nodnssec b/regression-tests/tests/tsig-axfr/skip.nodnssec similarity index 100% rename from regression-tests/tsig-axfr/skip.nodnssec rename to regression-tests/tests/tsig-axfr/skip.nodnssec diff --git a/regression-tests/tsig-axfr/skip.presigned b/regression-tests/tests/tsig-axfr/skip.presigned similarity index 100% rename from regression-tests/tsig-axfr/skip.presigned rename to regression-tests/tests/tsig-axfr/skip.presigned diff --git a/regression-tests/two-level-nxdomain/command b/regression-tests/tests/two-level-nxdomain/command similarity index 100% rename from regression-tests/two-level-nxdomain/command rename to regression-tests/tests/two-level-nxdomain/command diff --git a/regression-tests/two-level-nxdomain/description b/regression-tests/tests/two-level-nxdomain/description similarity index 100% rename from regression-tests/two-level-nxdomain/description rename to regression-tests/tests/two-level-nxdomain/description diff --git a/regression-tests/two-level-nxdomain/expected_result b/regression-tests/tests/two-level-nxdomain/expected_result similarity index 100% rename from regression-tests/two-level-nxdomain/expected_result rename to regression-tests/tests/two-level-nxdomain/expected_result diff --git a/regression-tests/two-level-nxdomain/expected_result.narrow b/regression-tests/tests/two-level-nxdomain/expected_result.narrow similarity index 100% rename from regression-tests/two-level-nxdomain/expected_result.narrow rename to regression-tests/tests/two-level-nxdomain/expected_result.narrow diff --git a/regression-tests/two-level-nxdomain/expected_result.nsec3 b/regression-tests/tests/two-level-nxdomain/expected_result.nsec3 similarity index 100% rename from regression-tests/two-level-nxdomain/expected_result.nsec3 rename to regression-tests/tests/two-level-nxdomain/expected_result.nsec3 diff --git a/regression-tests/two-level-nxdomain/skip.nodnssec b/regression-tests/tests/two-level-nxdomain/skip.nodnssec similarity index 100% rename from regression-tests/two-level-nxdomain/skip.nodnssec rename to regression-tests/tests/two-level-nxdomain/skip.nodnssec diff --git a/regression-tests/underscore-sorting/command b/regression-tests/tests/underscore-sorting/command similarity index 100% rename from regression-tests/underscore-sorting/command rename to regression-tests/tests/underscore-sorting/command diff --git a/regression-tests/underscore-sorting/description b/regression-tests/tests/underscore-sorting/description similarity index 100% rename from regression-tests/underscore-sorting/description rename to regression-tests/tests/underscore-sorting/description diff --git a/regression-tests/underscore-sorting/expected_result b/regression-tests/tests/underscore-sorting/expected_result similarity index 100% rename from regression-tests/underscore-sorting/expected_result rename to regression-tests/tests/underscore-sorting/expected_result diff --git a/regression-tests/underscore-sorting/expected_result.narrow b/regression-tests/tests/underscore-sorting/expected_result.narrow similarity index 100% rename from regression-tests/underscore-sorting/expected_result.narrow rename to regression-tests/tests/underscore-sorting/expected_result.narrow diff --git a/regression-tests/underscore-sorting/expected_result.nsec3 b/regression-tests/tests/underscore-sorting/expected_result.nsec3 similarity index 100% rename from regression-tests/underscore-sorting/expected_result.nsec3 rename to regression-tests/tests/underscore-sorting/expected_result.nsec3 diff --git a/regression-tests/underscore-sorting/skip.nodnssec b/regression-tests/tests/underscore-sorting/skip.nodnssec similarity index 100% rename from regression-tests/underscore-sorting/skip.nodnssec rename to regression-tests/tests/underscore-sorting/skip.nodnssec diff --git a/regression-tests/unknown-domain/command b/regression-tests/tests/unknown-domain/command similarity index 100% rename from regression-tests/unknown-domain/command rename to regression-tests/tests/unknown-domain/command diff --git a/regression-tests/unknown-domain/description b/regression-tests/tests/unknown-domain/description similarity index 100% rename from regression-tests/unknown-domain/description rename to regression-tests/tests/unknown-domain/description diff --git a/regression-tests/unknown-domain/expected_result b/regression-tests/tests/unknown-domain/expected_result similarity index 100% rename from regression-tests/unknown-domain/expected_result rename to regression-tests/tests/unknown-domain/expected_result diff --git a/regression-tests/uppercase-nsec/command b/regression-tests/tests/uppercase-nsec/command similarity index 100% rename from regression-tests/uppercase-nsec/command rename to regression-tests/tests/uppercase-nsec/command diff --git a/regression-tests/uppercase-nsec/description b/regression-tests/tests/uppercase-nsec/description similarity index 100% rename from regression-tests/uppercase-nsec/description rename to regression-tests/tests/uppercase-nsec/description diff --git a/regression-tests/uppercase-nsec/expected_result b/regression-tests/tests/uppercase-nsec/expected_result similarity index 100% rename from regression-tests/uppercase-nsec/expected_result rename to regression-tests/tests/uppercase-nsec/expected_result diff --git a/regression-tests/uppercase-nsec/expected_result.narrow b/regression-tests/tests/uppercase-nsec/expected_result.narrow similarity index 100% rename from regression-tests/uppercase-nsec/expected_result.narrow rename to regression-tests/tests/uppercase-nsec/expected_result.narrow diff --git a/regression-tests/uppercase-nsec/expected_result.nsec3 b/regression-tests/tests/uppercase-nsec/expected_result.nsec3 similarity index 100% rename from regression-tests/uppercase-nsec/expected_result.nsec3 rename to regression-tests/tests/uppercase-nsec/expected_result.nsec3 diff --git a/regression-tests/uppercase-nsec/skip.nodnssec b/regression-tests/tests/uppercase-nsec/skip.nodnssec similarity index 100% rename from regression-tests/uppercase-nsec/skip.nodnssec rename to regression-tests/tests/uppercase-nsec/skip.nodnssec diff --git a/regression-tests/url-record/command b/regression-tests/tests/url-record/command similarity index 100% rename from regression-tests/url-record/command rename to regression-tests/tests/url-record/command diff --git a/regression-tests/url-record/description b/regression-tests/tests/url-record/description similarity index 100% rename from regression-tests/url-record/description rename to regression-tests/tests/url-record/description diff --git a/regression-tests/url-record/expected_result b/regression-tests/tests/url-record/expected_result similarity index 100% rename from regression-tests/url-record/expected_result rename to regression-tests/tests/url-record/expected_result diff --git a/regression-tests/url-record/skip b/regression-tests/tests/url-record/skip similarity index 100% rename from regression-tests/url-record/skip rename to regression-tests/tests/url-record/skip diff --git a/regression-tests/verify-dnssec-zone/command b/regression-tests/tests/verify-dnssec-zone/command similarity index 89% rename from regression-tests/verify-dnssec-zone/command rename to regression-tests/tests/verify-dnssec-zone/command index 16adf1735..cfd433fa0 100755 --- a/regression-tests/verify-dnssec-zone/command +++ b/regression-tests/tests/verify-dnssec-zone/command @@ -1,5 +1,5 @@ #!/usr/bin/env bash -for zone in $(grep zone named.conf | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$') +for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$') do TFILE=$(mktemp) dig axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE diff --git a/regression-tests/verify-dnssec-zone/description b/regression-tests/tests/verify-dnssec-zone/description similarity index 100% rename from regression-tests/verify-dnssec-zone/description rename to regression-tests/tests/verify-dnssec-zone/description diff --git a/regression-tests/verify-dnssec-zone/expected_result b/regression-tests/tests/verify-dnssec-zone/expected_result similarity index 100% rename from regression-tests/verify-dnssec-zone/expected_result rename to regression-tests/tests/verify-dnssec-zone/expected_result diff --git a/regression-tests/verify-dnssec-zone/skip.narrow b/regression-tests/tests/verify-dnssec-zone/skip.narrow similarity index 100% rename from regression-tests/verify-dnssec-zone/skip.narrow rename to regression-tests/tests/verify-dnssec-zone/skip.narrow diff --git a/regression-tests/verify-dnssec-zone/skip.nodnssec b/regression-tests/tests/verify-dnssec-zone/skip.nodnssec similarity index 100% rename from regression-tests/verify-dnssec-zone/skip.nodnssec rename to regression-tests/tests/verify-dnssec-zone/skip.nodnssec diff --git a/regression-tests/verify-dnssec-zone/skip.oracle-nsec b/regression-tests/tests/verify-dnssec-zone/skip.oracle-nsec similarity index 100% rename from regression-tests/verify-dnssec-zone/skip.oracle-nsec rename to regression-tests/tests/verify-dnssec-zone/skip.oracle-nsec diff --git a/regression-tests/verify-dnssec-zone/skip.oracle-nsec3 b/regression-tests/tests/verify-dnssec-zone/skip.oracle-nsec3 similarity index 100% rename from regression-tests/verify-dnssec-zone/skip.oracle-nsec3 rename to regression-tests/tests/verify-dnssec-zone/skip.oracle-nsec3 diff --git a/regression-tests/very-long-txt/command b/regression-tests/tests/very-long-txt/command similarity index 100% rename from regression-tests/very-long-txt/command rename to regression-tests/tests/very-long-txt/command diff --git a/regression-tests/very-long-txt/description b/regression-tests/tests/very-long-txt/description similarity index 100% rename from regression-tests/very-long-txt/description rename to regression-tests/tests/very-long-txt/description diff --git a/regression-tests/very-long-txt/expected_result b/regression-tests/tests/very-long-txt/expected_result similarity index 100% rename from regression-tests/very-long-txt/expected_result rename to regression-tests/tests/very-long-txt/expected_result diff --git a/regression-tests/very-long-txt/skip.bind b/regression-tests/tests/very-long-txt/skip.bind similarity index 100% rename from regression-tests/very-long-txt/skip.bind rename to regression-tests/tests/very-long-txt/skip.bind diff --git a/regression-tests/very-long-txt/skip.mydns b/regression-tests/tests/very-long-txt/skip.mydns similarity index 100% rename from regression-tests/very-long-txt/skip.mydns rename to regression-tests/tests/very-long-txt/skip.mydns diff --git a/regression-tests/very-long-txt/skip.nsd b/regression-tests/tests/very-long-txt/skip.nsd similarity index 100% rename from regression-tests/very-long-txt/skip.nsd rename to regression-tests/tests/very-long-txt/skip.nsd diff --git a/regression-tests/wildcard-overlaps-delegation/command b/regression-tests/tests/wildcard-overlaps-delegation/command similarity index 100% rename from regression-tests/wildcard-overlaps-delegation/command rename to regression-tests/tests/wildcard-overlaps-delegation/command diff --git a/regression-tests/wildcard-overlaps-delegation/description b/regression-tests/tests/wildcard-overlaps-delegation/description similarity index 100% rename from regression-tests/wildcard-overlaps-delegation/description rename to regression-tests/tests/wildcard-overlaps-delegation/description diff --git a/regression-tests/wildcard-overlaps-delegation/expected_result b/regression-tests/tests/wildcard-overlaps-delegation/expected_result similarity index 100% rename from regression-tests/wildcard-overlaps-delegation/expected_result rename to regression-tests/tests/wildcard-overlaps-delegation/expected_result diff --git a/regression-tests/wildcard-overlaps-delegation/skip-unboundhost b/regression-tests/tests/wildcard-overlaps-delegation/skip-unboundhost similarity index 100% rename from regression-tests/wildcard-overlaps-delegation/skip-unboundhost rename to regression-tests/tests/wildcard-overlaps-delegation/skip-unboundhost diff --git a/regression-tests/wrong-type-wildcard/command b/regression-tests/tests/wrong-type-wildcard/command similarity index 100% rename from regression-tests/wrong-type-wildcard/command rename to regression-tests/tests/wrong-type-wildcard/command diff --git a/regression-tests/wrong-type-wildcard/description b/regression-tests/tests/wrong-type-wildcard/description similarity index 100% rename from regression-tests/wrong-type-wildcard/description rename to regression-tests/tests/wrong-type-wildcard/description diff --git a/regression-tests/wrong-type-wildcard/expected_result b/regression-tests/tests/wrong-type-wildcard/expected_result similarity index 100% rename from regression-tests/wrong-type-wildcard/expected_result rename to regression-tests/tests/wrong-type-wildcard/expected_result diff --git a/regression-tests/zones/.gitignore b/regression-tests/zones/.gitignore new file mode 100644 index 000000000..0d9429435 --- /dev/null +++ b/regression-tests/zones/.gitignore @@ -0,0 +1,10 @@ +/test.dyndns +/*.com-slave +/*.dyndns-slave +/*.signed +/*.nsd +/ixfr.state +/nsd.db +/ixfr-slave.db +/ixfr-slave.state +/nsd-slave.db diff --git a/regression-tests/addzone.com b/regression-tests/zones/addzone.com similarity index 100% rename from regression-tests/addzone.com rename to regression-tests/zones/addzone.com diff --git a/regression-tests/delegated.dnssec-parent.com b/regression-tests/zones/delegated.dnssec-parent.com similarity index 100% rename from regression-tests/delegated.dnssec-parent.com rename to regression-tests/zones/delegated.dnssec-parent.com diff --git a/regression-tests/dnssec-parent.com b/regression-tests/zones/dnssec-parent.com similarity index 100% rename from regression-tests/dnssec-parent.com rename to regression-tests/zones/dnssec-parent.com diff --git a/regression-tests/example.com b/regression-tests/zones/example.com similarity index 100% rename from regression-tests/example.com rename to regression-tests/zones/example.com diff --git a/regression-tests/minimal.com b/regression-tests/zones/minimal.com similarity index 100% rename from regression-tests/minimal.com rename to regression-tests/zones/minimal.com diff --git a/regression-tests/nztest.com b/regression-tests/zones/nztest.com similarity index 100% rename from regression-tests/nztest.com rename to regression-tests/zones/nztest.com diff --git a/regression-tests/powerdnssec.org b/regression-tests/zones/powerdnssec.org similarity index 100% rename from regression-tests/powerdnssec.org rename to regression-tests/zones/powerdnssec.org diff --git a/regression-tests/secure-delegated.dnssec-parent.com b/regression-tests/zones/secure-delegated.dnssec-parent.com similarity index 100% rename from regression-tests/secure-delegated.dnssec-parent.com rename to regression-tests/zones/secure-delegated.dnssec-parent.com diff --git a/regression-tests/stest.com b/regression-tests/zones/stest.com similarity index 100% rename from regression-tests/stest.com rename to regression-tests/zones/stest.com diff --git a/regression-tests/test.com b/regression-tests/zones/test.com similarity index 100% rename from regression-tests/test.com rename to regression-tests/zones/test.com diff --git a/regression-tests/test.dyndns.orig b/regression-tests/zones/test.dyndns.orig similarity index 100% rename from regression-tests/test.dyndns.orig rename to regression-tests/zones/test.dyndns.orig diff --git a/regression-tests/tsig.com b/regression-tests/zones/tsig.com similarity index 100% rename from regression-tests/tsig.com rename to regression-tests/zones/tsig.com diff --git a/regression-tests/wtest.com b/regression-tests/zones/wtest.com similarity index 100% rename from regression-tests/wtest.com rename to regression-tests/zones/wtest.com -- 2.40.0