[git commit master] cpio test: fix false positive with DESKTOP off

Denys Vlasenko vda.linux at googlemail.com
Sun Mar 28 18:07:42 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=03f6ee28d606004f450a9ca6fad09ad4e4a43194
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 testsuite/cpio.tests |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 75f0858..e53ade9 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -7,7 +7,8 @@
 # ls -ln shows date. Need to remove that, it's variable.
 # sed: coalesce spaces
 # cut: remove date
-FILTER_LS="sed 's/  */ /g' | cut -d' ' -f 1-5,9-"
+# grep: remove "total NNN" lines
+FILTER_LS="sed 's/  */ /g' | cut -d' ' -f 1-5,9- | grep -v '^total '"
 
 
 # newc cpio archive of directory cpio.testdir with empty x and y hardlinks
@@ -36,7 +37,6 @@ ls -ln cpio.testdir | $FILTER_LS" \
 "\
 1 blocks
 0
-total 0
 -rw-r--r-- 2 $user $group 0 x
 -rw-r--r-- 2 $user $group 0 y
 " \
@@ -75,7 +75,6 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
 "\
 2 blocks
 0
-total 8
 -rw-r--r-- 2 $user $group 0 empty
 -rw-r--r-- 2 $user $group 0 empty1
 -rw-r--r-- 2 $user $group 2 nonempty
-- 
1.6.3.3



More information about the busybox-cvs mailing list