force show-zone to output DS for ZSK

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 5ddcf33d2abcdaee0ab6da74e8586467e308a9ee..0825de9a5c95018f389656779b9e8ddaca1bd637 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -104,7 +104,7 @@ EOF
                        fi
 
                        # add DS records into list-all-records
-                        $PDNSUTIL --config-dir=. --config-name=remote show-zone up.example.com | gawk '{ if ($1=="DS") { printf "up.example.com.               120     IN      DS      " $6 " " $7 " " $8 " " substr(toupper($9),0,56); if (length($9)>56) { print " " substr(toupper($9),57) } else { print "" } } }' > $testsdir/list-all-records/expected_dnssec_part2
+                        $PDNSUTIL --config-dir=. --config-name=remote show-zone -v up.example.com | gawk '{ if ($1=="DS") { printf "up.example.com.            120     IN      DS      " $6 " " $7 " " $8 " " substr(toupper($9),0,56); if (length($9)>56) { print " " substr(toupper($9),57) } else { print "" } } }' > $testsdir/list-all-records/expected_dnssec_part2
                        cat $testsdir/list-all-records/expected_dnssec_part1 $testsdir/list-all-records/expected_dnssec_part2 $testsdir/list-all-records/expected_dnssec_part3 > $testsdir/list-all-records/expected_result.dnssec 
                        cp -f $testsdir/list-all-records/expected_result.dnssec $testsdir/list-all-records/expected_result.nsec3
                fi

diff --git a/regression-tests/gsql_feed_ds.pl b/regression-tests/gsql_feed_ds.pl
index 92a66556369cac7ca6ed90e4f88d3699c55b4f7c..6d5366b78f2d99fd93ab7092cbf8448702734822 100755 (executable)
--- a/regression-tests/gsql_feed_ds.pl
+++ b/regression-tests/gsql_feed_ds.pl
@@ -13,7 +13,7 @@ my $sqlcmd = shift;
 
 die "Usage: $0 domain parent pdnsutil sqlcmd" unless($domain and $parent and $pdnsutil and $sqlcmd);
 
-open IN, "-|", "$pdnsutil show-zone $domain 2>&1";
+open IN, "-|", "$pdnsutil show-zone -v $domain 2>&1";
 
 my $recs = [];