skip unsupported test for ext-nsd

diff --git a/regression-tests/.gitignore b/regression-tests/.gitignore
index 76ce46dbd9ab975ac7f173968b1c12e87b3d14a5..3032e4ad6be5d8e43d99e64021b779322c014998 100644 (file)
--- a/regression-tests/.gitignore
+++ b/regression-tests/.gitignore
@@ -27,3 +27,4 @@ real_result
 /recursor.log
 /top-1m.csv
 /report.json
+/*.nsd

diff --git a/regression-tests/basic-eui48/skip.nsd b/regression-tests/basic-eui48/skip.nsd
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/basic-eui64/skip.nsd b/regression-tests/basic-eui64/skip.nsd
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regression-tests/example.com b/regression-tests/example.com
index 31e7343bb0e455ec8b22a68cc37c995682f8bdd4..4e18d384905bd5185b6411afcb3f8fd75b2e381f 100644 (file)
--- a/regression-tests/example.com
+++ b/regression-tests/example.com
@@ -20183,5 +20183,5 @@ host-19999      IN      A       192.168.1.31
 ;
 double                 IN      A       192.168.5.1
 
-;host-0          IN   EUI48      00-50-56-9b-00-e7
-;host-1          IN   EUI64      00-50-56-9b-00-e7-7e-57
+host-0          IN   EUI48      00-50-56-9b-00-e7
+host-1          IN   EUI64      00-50-56-9b-00-e7-7e-57

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 88d6f3e2ef0e03f6d255cb8e8fed37c009eb3a1a..5cee21ebbfb1fab94819562b5ee7bcd602883a0b 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -3,9 +3,10 @@
 PDNS=${PDNS:-../pdns/pdns_server}
 PDNS2=${PDNS2:-../pdns/pdns_server}
 
-cleanlongtxt ()
+nsdfix ()
 {
-       sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.shorttxt
+       sed -e 's/"A very .*"/"shorter"/' < test.com > test.com.nsd
+       sed '/EUI/s/^/;/g' < example.com > example.com.nsd
 }
 
 tonsd ()
@@ -18,7 +19,7 @@ server:
        username: ""
 __EOF__
 
-       cleanlongtxt
+       nsdfix
        rm -f K*
        for zone in $(grep zone named.conf  | cut -f2 -d\")
        do
@@ -29,9 +30,9 @@ __EOF__
                        ksk="secure-delegated.dnssec-parent.com"
                fi
                zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone)
-               if [ $zone = test.com ]
+               if [ -f $zone.nsd ]
                then
-                       zonefile=test.com.shorttxt
+                       zonefile=${zone}.nsd
                else
                        zonefile=${zone}
                fi
@@ -232,22 +233,22 @@ case $context in
                                ext-nsd)
                                        tonsd unsigned
                                        extracontexts="extnsd"
-                                       skipreasons="nodnssec nodyndns"
+                                       skipreasons="nsd nodnssec nodyndns"
                                        ;;
                                ext-nsd-nsec)
                                        tonsd nsec
                                        extracontexts="extnsd dnssec"
-                                       skipreasons=nodyndns
+                                       skipreasons="nsd nodyndns"
                                        ;;
                                ext-nsd-nsec3)
                                        tonsd nsec3
                                        extracontexts="extnsd dnssec nsec3"
-                                       skipreasons="nsec3 nodyndns"
+                                       skipreasons="nsd nsec3 nodyndns"
                                        ;;
                                ext-nsd-nsec3-optout)
                                        tonsd nsec3-optout
                                        extracontexts="extnsd dnssec nsec3 nsec3-optout"
-                                       skipreasons="optout nodyndns"
+                                       skipreasons="nsd optout nodyndns"
                                        ;;
                        esac
                        nsd -c nsd.conf -P pdns.pid -d &

diff --git a/regression-tests/very-long-txt/skip.nsd b/regression-tests/very-long-txt/skip.nsd
new file mode 100644 (file)
index 0000000..e69de29