From 28002bd7cb4baa0eab9f47e1e51069c5ea7ea5d4 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Mon, 20 Nov 2000 17:59:20 +0000 Subject: [PATCH] replaced update.scp with a here document --- bin/tests/system/nsupdate/tests.sh | 14 ++++++++------ bin/tests/system/nsupdate/update.scp | 5 ----- util/copyrights | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 bin/tests/system/nsupdate/update.scp diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 84e1819acc..9b1d9d6f67 100644 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.13 2000/11/20 17:53:33 gson Exp $ +# $Id: tests.sh,v 1.14 2000/11/20 17:59:20 gson Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -36,7 +36,13 @@ $PERL ../digcomp.pl knowngood.ns1.before dig.out.ns2 || status=1 echo "I:updating zone" # nsupdate will print a ">" prompt to stdout as it gets each input line. -$NSUPDATE < update.scp > /dev/null || status=1 +$NSUPDATE < /dev/null || status=1 +server 10.53.0.1 5300 +update add updated.example.nil. 600 A 10.10.10.1 +update add updated.example.nil. 600 TXT Foo +update delete t.example.nil. + +END echo "I:sleeping 15 seconds for server to incorporate changes" sleep 15 @@ -87,9 +93,5 @@ $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd example.nil.\ echo "I:comparing zones" $PERL ../digcomp.pl dig.out.ns1 dig.out.ns1.after || status=1 -echo "I:performing RT #482 regression test" - - - echo "I:exit status: $status" exit $status diff --git a/bin/tests/system/nsupdate/update.scp b/bin/tests/system/nsupdate/update.scp deleted file mode 100644 index a1e9e416db..0000000000 --- a/bin/tests/system/nsupdate/update.scp +++ /dev/null @@ -1,5 +0,0 @@ -server 10.53.0.1 5300 -update add updated.example.nil. 600 A 10.10.10.1 -update add updated.example.nil. 600 TXT Foo -update delete t.example.nil. - diff --git a/util/copyrights b/util/copyrights index 253d4e4cd2..6b8a405a5e 100644 --- a/util/copyrights +++ b/util/copyrights @@ -457,7 +457,6 @@ ./bin/tests/system/nsupdate/ns2/named.conf CONF-C 2000 ./bin/tests/system/nsupdate/setup.sh SH 2000 ./bin/tests/system/nsupdate/tests.sh SH 2000 -./bin/tests/system/nsupdate/update.scp X 2000 ./bin/tests/system/nsupdate/update_test.pl PERL 2000 ./bin/tests/system/relay/README TXT.BRIEF 2000 ./bin/tests/system/relay/clean.sh SH 2000