]> granicus.if.org Git - pdns/commitdiff
use gsort when available, because sort -V is a GNU extension
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Thu, 16 Aug 2018 19:23:04 +0000 (21:23 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Tue, 21 Aug 2018 10:37:38 +0000 (12:37 +0200)
(cherry picked from commit da25a468e4cc99af89da4730d32ea0ed3b8643a5)

regression-tests/mysqldiff

index ce8278a4aba7fac4079470e75e8c2e4ce0c6edc1..17bfdd64523743bc9f2c67bc4186d385bdfa117d 100755 (executable)
@@ -23,10 +23,17 @@ else
                -e "SELECT r.name, r.type, r.prio, r.content, r.ttl, CONCAT('''', CONCAT(r.ordername, '''')), r.auth FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND(r.type != 'SOA' OR r.type IS NULL) ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step
 fi
 
+if type gsort >/dev/null 2>/dev/null
+then
+       SORT=gsort
+else
+       SORT=sort
+fi
+
 if [ ! "$step" == "start" ]
 then
        echo -e "$comment\n--- Start: diff $diffto $step ---"
-       diff ${testsdir}/${testname}/$diffto ${testsdir}/${testname}/$step | sed '/^[0-9a-z,/-]*$/d' | sort -V
+       diff ${testsdir}/${testname}/$diffto ${testsdir}/${testname}/$step | sed '/^[0-9a-z,/-]*$/d' | $SORT -V
        if [ ${PIPESTATUS[0]} -eq 0 ]
        then
                echo "no difference"