4304. [port] xfer system test failed as 'tail -n +value' is not

portable. [RT #41315]

(cherry picked from commit 9d85a77382)
This commit is contained in:
Mark Andrews
2016-01-28 15:38:06 +11:00
parent ee738a1793
commit a066b4c550
2 changed files with 9 additions and 6 deletions

View File

@@ -257,7 +257,7 @@ do
sleep 1
done
tail -n +"$cur" < ns4/named.run | grep "Transfer status: success" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: success" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}
@@ -277,7 +277,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
sleep 2
tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}
@@ -297,7 +297,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
sleep 2
tail -n +"$cur" < ns4/named.run | grep "Transfer status: tsig verify failure" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: tsig verify failure" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}
@@ -317,7 +317,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
sleep 2
tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}
@@ -337,7 +337,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
sleep 2
tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}
@@ -357,7 +357,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
sleep 2
tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
sed -n "$cur,\$p" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
echo "I: failed: expected status was not logged"
status=1
}