From: Wayne Davison <wayned@samba.org>
Date: Tue, 22 Feb 2011 15:41:02 +0000 (-0800)
Subject: Fix test 5's failure message.
X-Git-Tag: v3.0.8pre1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b5c770db603d1b173fc2835931fd9b1b069556;p=thirdparty%2Frsync.git

Fix test 5's failure message.
---

diff --git a/testsuite/devices.test b/testsuite/devices.test
index 1e7b7762..a6474dc7 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -116,8 +116,8 @@ cD$all_plus char2
 cD$all_plus char3
 cS$all_plus fifo
 EOT
-if test ! -r "$fromdir/block2.5"; then
-    sed -e '/block2\.5/d' <"$chkfile" >"$chkfile.new"
+if test ! -b "$fromdir/block2.5"; then
+    grep -v block2.5 <"$chkfile" >"$chkfile.new"
     mv "$chkfile.new" "$chkfile"
 fi
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
@@ -143,7 +143,7 @@ hD$allspace char2
 hD$allspace char3
 hS$allspace fifo
 EOT
-    diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
+    diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
 fi
 
 # The script would have aborted on error, so getting here means we've won.