make more tests pass on osx by improving script portability

diff --git a/regression-tests/tests/basic-aaaa-resolution/command b/regression-tests/tests/basic-aaaa-resolution/command
index 635329ad90d8aa9bd37ead1e4d8e9f3d565f52d0..a796c6bbd74aa580393c725d87b996364be8ba39 100755 (executable)
--- a/regression-tests/tests/basic-aaaa-resolution/command
+++ b/regression-tests/tests/basic-aaaa-resolution/command
@@ -1,3 +1,3 @@
 #!/bin/sh
-cleandig ipv6.example.com AAAA
+cleandig ipv6.example.com AAAA | perl -pe 's/2001:6a8::1:210:4bff:fe4b:4c61/2001:6a8:0:1:210:4bff:fe4b:4c61/'
 

diff --git a/regression-tests/tests/ent-axfr/command b/regression-tests/tests/ent-axfr/command
index a7079b6aa8920f2b9075bac176ba273911c8fd50..d37bbe8be9cbad77a6497eaa17b2ff35826c9c5b 100755 (executable)
--- a/regression-tests/tests/ent-axfr/command
+++ b/regression-tests/tests/ent-axfr/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-cleandig test.com AXFR showdetails | grep -P 'IN\tNSEC'
\ No newline at end of file
+cleandig test.com AXFR showdetails | perl -ne 'print if /IN\tNSEC/'

diff --git a/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command b/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command
index f918d86347e52f195a36c41a522d4129d791585a..74211c62db755e4f065f647f590c3a6c5d537eb4 100755 (executable)
--- a/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command
+++ b/regression-tests/tests/too-big-for-udp-query-no-truncate-additional/command
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cleandig together-too-much.example.com MX | sed 's/\(19[23]\.168\.99\.\)[0-9]\+/\1/' | sed 's/toomuchinfo-[ab]/toomuchinfo-X/'
+cleandig together-too-much.example.com MX | perl -pe 's/(192\.168\.99\.)[0-9]+/$1/; s/toomuchinfo-[ab]/toomuchinfo-X/;'

diff --git a/regression-tests/tests/too-big-for-udp-query/command b/regression-tests/tests/too-big-for-udp-query/command
index 34000a5ad863bec25711105c6e1cdb844228eac6..35a6678226c74f7e35daef7f5a894d6c4943253c 100755 (executable)
--- a/regression-tests/tests/too-big-for-udp-query/command
+++ b/regression-tests/tests/too-big-for-udp-query/command
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cleandig toomuchinfo-b.example.com A | sed 's/\(192\.168\.99\.\)[0-9]\+/\1/'
+cleandig toomuchinfo-b.example.com A | perl -pe 's/(192\.168\.99\.)[0-9]+/$1/'

diff --git a/regression-tests/tests/verify-dnssec-zone/command b/regression-tests/tests/verify-dnssec-zone/command
index f9c11a7143c3fcb8023e7d900ed05c6384d22cab..b446e0f39e60ad37c22aff1c1eee3973965771af 100755 (executable)
--- a/regression-tests/tests/verify-dnssec-zone/command
+++ b/regression-tests/tests/verify-dnssec-zone/command
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
-       TFILE=$(mktemp)
+       TFILE=$(mktemp tmp.XXXXXXXXXX)
        dig axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE
        for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone named-checkzone
        do