avoid GNUisms to allow building with POSIXLY_CORRECT

diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index d611960cd04343b4fc4748aef76c9bf1e0075de9..84606f5c37fc533ccfa2c415612587f8e63f8400 100644 (file)
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -25,7 +25,7 @@ gmysql-host=$GMYSQLHOST
 gmysql-password=$GMYSQLPASSWD
 __EOF__
 
-               gsql-master gmysql
+               gsql_master gmysql
                ;;
 
        *)

diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master
index 173d20a5a54127286ddd62ba5be378d908d36d32..175747b1387c4355df30106b2637fe98504eca3f 100644 (file)
--- a/regression-tests/backends/goracle-master
+++ b/regression-tests/backends/goracle-master
@@ -34,7 +34,7 @@ goracle-user=$GORACLEUSER
 goracle-password=$GORACLEPASSWD
 __EOF__
 
-               gsql-master goracle nodyndns
+               gsql_master goracle nodyndns
                ;;
 
        *)

diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 741e4dd7abbf8a01969c593e5d9e0c6631c14979..21447683f2e1306f73efffd3a96edde5035e191f 100644 (file)
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -9,7 +9,7 @@ case $context in
                createdb --user="$GPGSQLUSER" "$GPGSQLDB"       || echo ignoring mysqladmin drop failure
                psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/schema.pgsql.sql
                tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c
-                psql --user="$GPGSQLUSER" "$GPGSQLDB" -c "ANALYZE"
+                psql --user="$GPGSQLUSER" -c "ANALYZE" "$GPGSQLDB"
 
                cat > pdns-gpgsql.conf << __EOF__
 module-dir=./modules
@@ -18,7 +18,7 @@ gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
 __EOF__
 
-               gsql-master gpgsql nodyndns
+               gsql_master gpgsql nodyndns
                ;;
 
        *)

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index 49973516685fa9732650eaaa102d7be7696393d2..734d95dee8717fa15aba346c7a1c49370b7a41ff 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -20,8 +20,9 @@ __EOF__
 
        for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | tac)
        do
-               psql --user="$GPGSQL2USER" "$GPGSQL2DB" \
-               -c "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')"
+               psql --user="$GPGSQL2USER" \
+               -c "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" \
+               "$GPGSQL2DB"
        done
 
        $PDNSSEC --config-dir=. --config-name=gpgsql2 import-tsig-key test $ALGORITHM $KEY
@@ -43,8 +44,9 @@ __EOF__
        while [ $loopcount -lt 30 ]
        do
                sleep 5
-               todo=$(psql --user="$GPGSQL2USER" "$GPGSQL2DB" \
-                 -t -c 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL')
+               todo=$(psql --user="$GPGSQL2USER" \
+                 -t -c 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL' \
+                  "$GPGSQL2DB")
                if [ $todo = 0 ]
                then
                        break

diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 6a035b96a2b51d144596f1db74c911967064b0f0..3e27d8d695ef3f91de0ed1a63c5035a58640f8cc 100644 (file)
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -1,4 +1,4 @@
-gsql-master()
+gsql_master()
 {
        backend=$1
        skipreasons=$2

diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master
index c7b3ec0cbb092e7d83eb6c759bd15d607c2e36eb..1f5063c1553a54edc4101f6296a2aa8c793ce0e4 100644 (file)
--- a/regression-tests/backends/gsqlite3-master
+++ b/regression-tests/backends/gsqlite3-master
@@ -13,7 +13,7 @@ launch=gsqlite3
 gsqlite3-database=pdns.sqlite3
 __EOF__
 
-               gsql-master gsqlite3 nodyndns
+               gsql_master gsqlite3 nodyndns
                ;;
 
        *)

diff --git a/regression-tests/tests/verify-dnssec-zone/command b/regression-tests/tests/verify-dnssec-zone/command
index 841d45c22be7b42d7370b8a70047901bca608d15..7f92e3eeaa6fab6ea0b3dfbc6771a2777a31727d 100755 (executable)
--- a/regression-tests/tests/verify-dnssec-zone/command
+++ b/regression-tests/tests/verify-dnssec-zone/command
@@ -2,7 +2,7 @@
 for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
        TFILE=$(mktemp tmp.XXXXXXXXXX)
-       drill axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE
+       drill -p $port axfr $zone @$nameserver | ldns-read-zone -z > $TFILE
        for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone named-checkzone
        do
                echo --- $validator $zone