[1213] Preparation for merge with master

Rename ixfr/clean.sh so it doesn't get executed in that directory.
Remove a few more blank lines at the start of shell scripts.

tests/system/ixfr/clean.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# Clean up after zone transfer tests.
+# Clean up nameserver directories after zone transfer tests.
 
 rm -f ns1/named.conf
 rm -f ns1/db.example

tests/system/ixfr/common_tests.sh.in

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/in-1/clean.sh

@@ -1 +1 @@
-../clean.sh
+../clean_ns.sh

tests/system/ixfr/in-1/tests.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/in-2/clean.sh

@@ -1 +1 @@
-../clean.sh
+../clean_ns.sh

tests/system/ixfr/in-3/clean.sh

@@ -1 +1 @@
-../clean.sh
+../clean_ns.sh

tests/system/ixfr/in-3/setup.sh.in

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/in-3/tests.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/in-4/clean.sh

@@ -1 +1 @@
-../clean.sh
+../clean_ns.sh

tests/system/ixfr/in-4/setup.sh.in

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/in-4/tests.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 #
 # Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")

tests/system/ixfr/ixfr_init.sh.in

@@ -314,9 +314,9 @@ compare_zones() {
     shift
 
     $DIG @$client_ip -p $DNS_PORT example. axfr | grep -v '^;' | grep -v '^$' \
-         | sed -e 's/ //g' -e 's/\t//g' > client.dig
+         | sed -e 's/ //g' -e 's/\t//g' | sort > client.dig
     $DIG @$server_ip -p $DNS_PORT example. axfr | grep -v '^;' | grep -v '^$' \
-         | sed -e 's/ //g' -e 's/\t//g' > server.dig
+         | sed -e 's/ //g' -e 's/\t//g' | sort > server.dig
     diff client.dig server.dig
     if [ $? -eq 0 ];
     then