summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorDenys Vlasenko2010-03-28 20:01:31 +0200
committerDenys Vlasenko2010-03-28 20:01:31 +0200
commit58cdca3984beb4e1019ef5ccf1dd7361f032a9a6 (patch)
tree922928fdb79cbdb6a02ffbeab7948c03ad501656 /testsuite
parente52b735231bda70d811e4f9ef0e21fb2c7af96a2 (diff)
downloadbusybox-1_16_1.zip
busybox-1_16_1.tar.gz
apply post-1.16.0 fixes, bump version to 1.16.11_16_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/cpio.tests5
1 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 75f0858..e53ade92 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