BIND 10 trac1213, updated. c12ca1170ad094e0450efeb462328ec6b6ec7e1f [1213] Preparation for merge with master
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Oct 12 11:50:00 UTC 2011
The branch, trac1213 has been updated
via c12ca1170ad094e0450efeb462328ec6b6ec7e1f (commit)
from 4cfd27849ef6f2e99ee346763695fbc64742d783 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c12ca1170ad094e0450efeb462328ec6b6ec7e1f
Author: Stephen Morris <stephen at isc.org>
Date: Tue Oct 11 15:26:07 2011 +0100
[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.
-----------------------------------------------------------------------
Summary of changes:
tests/system/ixfr/{clean.sh => clean_ns.sh} | 3 +--
tests/system/ixfr/common_tests.sh.in | 1 -
tests/system/ixfr/in-1/clean.sh | 2 +-
tests/system/ixfr/in-1/tests.sh | 1 -
tests/system/ixfr/in-2/clean.sh | 2 +-
tests/system/ixfr/in-3/clean.sh | 2 +-
tests/system/ixfr/in-3/setup.sh.in | 1 -
tests/system/ixfr/in-3/tests.sh | 1 -
tests/system/ixfr/in-4/clean.sh | 2 +-
tests/system/ixfr/in-4/setup.sh.in | 1 -
tests/system/ixfr/in-4/tests.sh | 1 -
tests/system/ixfr/ixfr_init.sh.in | 4 ++--
12 files changed, 7 insertions(+), 14 deletions(-)
rename tests/system/ixfr/{clean.sh => clean_ns.sh} (93%)
-----------------------------------------------------------------------
diff --git a/tests/system/ixfr/clean.sh b/tests/system/ixfr/clean.sh
deleted file mode 100644
index 16c305c..0000000
--- a/tests/system/ixfr/clean.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#!/bin/sh
-#
-# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# Clean up after zone transfer tests.
-
-rm -f ns1/named.conf
-rm -f ns1/db.example
-rm -f ns1/named.memstats
-
-rm -f nsx2/bind10.run
-rm -f ../zone.sqlite3
-
-rm -f client.dig
-rm -f server.dig
diff --git a/tests/system/ixfr/clean_ns.sh b/tests/system/ixfr/clean_ns.sh
new file mode 100644
index 0000000..8f6634f
--- /dev/null
+++ b/tests/system/ixfr/clean_ns.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# Clean up nameserver directories after zone transfer tests.
+
+rm -f ns1/named.conf
+rm -f ns1/db.example
+rm -f ns1/named.memstats
+
+rm -f nsx2/bind10.run
+rm -f ../zone.sqlite3
+
+rm -f client.dig
+rm -f server.dig
diff --git a/tests/system/ixfr/common_tests.sh.in b/tests/system/ixfr/common_tests.sh.in
index fc04c15..90d0284 100644
--- a/tests/system/ixfr/common_tests.sh.in
+++ b/tests/system/ixfr/common_tests.sh.in
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/in-1/clean.sh b/tests/system/ixfr/in-1/clean.sh
index 32ddd1b..099bebd 120000
--- a/tests/system/ixfr/in-1/clean.sh
+++ b/tests/system/ixfr/in-1/clean.sh
@@ -1 +1 @@
-../clean.sh
\ No newline at end of file
+../clean_ns.sh
\ No newline at end of file
diff --git a/tests/system/ixfr/in-1/tests.sh b/tests/system/ixfr/in-1/tests.sh
index c540818..2f49ddf 100644
--- a/tests/system/ixfr/in-1/tests.sh
+++ b/tests/system/ixfr/in-1/tests.sh
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/in-2/clean.sh b/tests/system/ixfr/in-2/clean.sh
index 32ddd1b..099bebd 120000
--- a/tests/system/ixfr/in-2/clean.sh
+++ b/tests/system/ixfr/in-2/clean.sh
@@ -1 +1 @@
-../clean.sh
\ No newline at end of file
+../clean_ns.sh
\ No newline at end of file
diff --git a/tests/system/ixfr/in-3/clean.sh b/tests/system/ixfr/in-3/clean.sh
index 32ddd1b..099bebd 120000
--- a/tests/system/ixfr/in-3/clean.sh
+++ b/tests/system/ixfr/in-3/clean.sh
@@ -1 +1 @@
-../clean.sh
\ No newline at end of file
+../clean_ns.sh
\ No newline at end of file
diff --git a/tests/system/ixfr/in-3/setup.sh.in b/tests/system/ixfr/in-3/setup.sh.in
index 9f10942..867e06e 100644
--- a/tests/system/ixfr/in-3/setup.sh.in
+++ b/tests/system/ixfr/in-3/setup.sh.in
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/in-3/tests.sh b/tests/system/ixfr/in-3/tests.sh
index b64b468..858b815 100644
--- a/tests/system/ixfr/in-3/tests.sh
+++ b/tests/system/ixfr/in-3/tests.sh
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/in-4/clean.sh b/tests/system/ixfr/in-4/clean.sh
index 32ddd1b..099bebd 120000
--- a/tests/system/ixfr/in-4/clean.sh
+++ b/tests/system/ixfr/in-4/clean.sh
@@ -1 +1 @@
-../clean.sh
\ No newline at end of file
+../clean_ns.sh
\ No newline at end of file
diff --git a/tests/system/ixfr/in-4/setup.sh.in b/tests/system/ixfr/in-4/setup.sh.in
index 0c0ea45..7419e27 100644
--- a/tests/system/ixfr/in-4/setup.sh.in
+++ b/tests/system/ixfr/in-4/setup.sh.in
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/in-4/tests.sh b/tests/system/ixfr/in-4/tests.sh
index 09a5562..3024253 100644
--- a/tests/system/ixfr/in-4/tests.sh
+++ b/tests/system/ixfr/in-4/tests.sh
@@ -1,4 +1,3 @@
-
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
diff --git a/tests/system/ixfr/ixfr_init.sh.in b/tests/system/ixfr/ixfr_init.sh.in
index 22817eb..ba6049e 100644
--- a/tests/system/ixfr/ixfr_init.sh.in
+++ b/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
More information about the bind10-changes
mailing list