check that sed selects a non zero range of lines

(cherry picked from commit 146c16c06e2faaca98772ce0f2aa99ff42e2be08)
(cherry picked from commit e0c9b5bd2bbac36a0418ce31533ea4668aa8b3ff)

diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index 0a06f3a0bec75e66cf9f25b6ec3d8f5226803b98..6122b3ce18598eca61e4222761bf417a834ece46 100644 (file)
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -21,6 +21,7 @@
 
 rm -f dig.out.ns2
 rm -f dig.out.expire
+rm -f sed.out.*
 rm -f */named.memstats
 rm -f */named.run
 rm -f ns2/named_dump.db.*

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index e2304e496d51bac28a7f27281c68ba097e85a67d..a2ab1d191c879d4619c4d238608ddb1acfb920d3 100644 (file)
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -228,11 +228,19 @@ ret=0
 load_cache
 dump_cache
 mv ns2/named_dump.db.$n ns2/named_dump.db.$n.a
-sed -n '/plain success\/timeout/,/Unassociated entries/p' ns2/named_dump.db.$n.a | grep 'ns.flushtest.example' > /dev/null 2>&1 || ret=1
+sed -n '/plain success\/timeout/,/Unassociated entries/p' \
+       ns2/named_dump.db.$n.a > sed.out.$n.a
+grep 'plain success/timeout' sed.out.$n.a > /dev/null 2>&1 || ret=1
+grep 'Unassociated entries' sed.out.$n.a > /dev/null 2>&1 || ret=1
+grep 'ns.flushtest.example' sed.out.$n.a > /dev/null 2>&1 || ret=1
 $RNDC $RNDCOPTS flushtree flushtest.example || ret=1
 dump_cache
 mv ns2/named_dump.db.$n ns2/named_dump.db.$n.b
-sed -n '/plain success\/timeout/,/Unassociated entries/p' ns2/named_dump.db.$n.b | grep 'ns.flushtest.example' > /dev/null 2>&1 && ret=1
+sed -n '/plain success\/timeout/,/Unassociated entries/p' \
+       ns2/named_dump.db.$n.b > sed.out.$n.b
+grep 'plain success/timeout' sed.out.$n.b > /dev/null 2>&1 || ret=1
+grep 'Unassociated entries' sed.out.$n.b > /dev/null 2>&1 || ret=1
+grep 'ns.flushtest.example' sed.out.$n.b > /dev/null 2>&1 && ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`