diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am index 915c02f487..b64a6a9ad8 100644 --- a/bin/tests/system/Makefile.am +++ b/bin/tests/system/Makefile.am @@ -113,7 +113,7 @@ TESTS = \ ednscompliance \ emptyzones \ enginepkcs11 \ - filter-aaaa \ + filters \ fetchlimit \ formerr \ forward \ diff --git a/bin/tests/system/filter-aaaa/.gitignore b/bin/tests/system/filters/.gitignore similarity index 100% rename from bin/tests/system/filter-aaaa/.gitignore rename to bin/tests/system/filters/.gitignore diff --git a/bin/tests/system/filter-aaaa/conf/bad1.conf.j2 b/bin/tests/system/filters/conf/bad1.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad1.conf.j2 rename to bin/tests/system/filters/conf/bad1.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/bad2.conf.j2 b/bin/tests/system/filters/conf/bad2.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad2.conf.j2 rename to bin/tests/system/filters/conf/bad2.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/bad3.conf.j2 b/bin/tests/system/filters/conf/bad3.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad3.conf.j2 rename to bin/tests/system/filters/conf/bad3.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/bad4.conf.j2 b/bin/tests/system/filters/conf/bad4.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad4.conf.j2 rename to bin/tests/system/filters/conf/bad4.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/bad5.conf.j2 b/bin/tests/system/filters/conf/bad5.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/bad5.conf.j2 rename to bin/tests/system/filters/conf/bad5.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/good1.conf.j2 b/bin/tests/system/filters/conf/good1.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good1.conf.j2 rename to bin/tests/system/filters/conf/good1.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/good2.conf.j2 b/bin/tests/system/filters/conf/good2.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good2.conf.j2 rename to bin/tests/system/filters/conf/good2.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/good3.conf.j2 b/bin/tests/system/filters/conf/good3.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good3.conf.j2 rename to bin/tests/system/filters/conf/good3.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/good4.conf.j2 b/bin/tests/system/filters/conf/good4.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good4.conf.j2 rename to bin/tests/system/filters/conf/good4.conf.j2 diff --git a/bin/tests/system/filter-aaaa/conf/good5.conf.j2 b/bin/tests/system/filters/conf/good5.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/conf/good5.conf.j2 rename to bin/tests/system/filters/conf/good5.conf.j2 diff --git a/bin/tests/system/filter-aaaa/ns1/named.conf.j2 b/bin/tests/system/filters/ns1/named.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/named.conf.j2 rename to bin/tests/system/filters/ns1/named.conf.j2 diff --git a/bin/tests/system/filter-aaaa/ns1/root.db b/bin/tests/system/filters/ns1/root.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/root.db rename to bin/tests/system/filters/ns1/root.db diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filters/ns1/sign.sh similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/sign.sh rename to bin/tests/system/filters/ns1/sign.sh diff --git a/bin/tests/system/filter-aaaa/ns1/signed.db.in b/bin/tests/system/filters/ns1/signed.db.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/signed.db.in rename to bin/tests/system/filters/ns1/signed.db.in diff --git a/bin/tests/system/filter-aaaa/ns1/unsigned.db b/bin/tests/system/filters/ns1/unsigned.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns1/unsigned.db rename to bin/tests/system/filters/ns1/unsigned.db diff --git a/bin/tests/system/filter-aaaa/ns2/hints b/bin/tests/system/filters/ns2/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns2/hints rename to bin/tests/system/filters/ns2/hints diff --git a/bin/tests/system/filter-aaaa/ns2/named.conf.j2 b/bin/tests/system/filters/ns2/named.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/ns2/named.conf.j2 rename to bin/tests/system/filters/ns2/named.conf.j2 diff --git a/bin/tests/system/filter-aaaa/ns3/hints b/bin/tests/system/filters/ns3/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns3/hints rename to bin/tests/system/filters/ns3/hints diff --git a/bin/tests/system/filter-aaaa/ns3/named.conf.j2 b/bin/tests/system/filters/ns3/named.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/ns3/named.conf.j2 rename to bin/tests/system/filters/ns3/named.conf.j2 diff --git a/bin/tests/system/filter-aaaa/ns4/named.conf.j2 b/bin/tests/system/filters/ns4/named.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/named.conf.j2 rename to bin/tests/system/filters/ns4/named.conf.j2 diff --git a/bin/tests/system/filter-aaaa/ns4/root.db b/bin/tests/system/filters/ns4/root.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/root.db rename to bin/tests/system/filters/ns4/root.db diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filters/ns4/sign.sh similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/sign.sh rename to bin/tests/system/filters/ns4/sign.sh diff --git a/bin/tests/system/filter-aaaa/ns4/signed.db.in b/bin/tests/system/filters/ns4/signed.db.in similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/signed.db.in rename to bin/tests/system/filters/ns4/signed.db.in diff --git a/bin/tests/system/filter-aaaa/ns4/unsigned.db b/bin/tests/system/filters/ns4/unsigned.db similarity index 100% rename from bin/tests/system/filter-aaaa/ns4/unsigned.db rename to bin/tests/system/filters/ns4/unsigned.db diff --git a/bin/tests/system/filter-aaaa/ns5/hints b/bin/tests/system/filters/ns5/hints similarity index 100% rename from bin/tests/system/filter-aaaa/ns5/hints rename to bin/tests/system/filters/ns5/hints diff --git a/bin/tests/system/filter-aaaa/ns5/named.conf.j2 b/bin/tests/system/filters/ns5/named.conf.j2 similarity index 100% rename from bin/tests/system/filter-aaaa/ns5/named.conf.j2 rename to bin/tests/system/filters/ns5/named.conf.j2 diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filters/setup.sh similarity index 100% rename from bin/tests/system/filter-aaaa/setup.sh rename to bin/tests/system/filters/setup.sh diff --git a/bin/tests/system/filter-aaaa/tests_filter_aaaa.py b/bin/tests/system/filters/tests_filters.py similarity index 100% rename from bin/tests/system/filter-aaaa/tests_filter_aaaa.py rename to bin/tests/system/filters/tests_filters.py