aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-28 20:07:42 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-03-28 20:07:42 +0200
commit03f6ee28d606004f450a9ca6fad09ad4e4a43194 (patch)
tree3858a227f63b584b216ddced5945f6ffe83b0bbb
parent4816fe9179057f7869e9324954adc939b647bc01 (diff)
downloadbusybox-w32-03f6ee28d606004f450a9ca6fad09ad4e4a43194.tar.gz
busybox-w32-03f6ee28d606004f450a9ca6fad09ad4e4a43194.tar.bz2
busybox-w32-03f6ee28d606004f450a9ca6fad09ad4e4a43194.zip
cpio test: fix false positive with DESKTOP off
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xtestsuite/cpio.tests5
1 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 75f085873..e53ade925 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -7,7 +7,8 @@
7# ls -ln shows date. Need to remove that, it's variable. 7# ls -ln shows date. Need to remove that, it's variable.
8# sed: coalesce spaces 8# sed: coalesce spaces
9# cut: remove date 9# cut: remove date
10FILTER_LS="sed 's/ */ /g' | cut -d' ' -f 1-5,9-" 10# grep: remove "total NNN" lines
11FILTER_LS="sed 's/ */ /g' | cut -d' ' -f 1-5,9- | grep -v '^total '"
11 12
12 13
13# newc cpio archive of directory cpio.testdir with empty x and y hardlinks 14# newc cpio archive of directory cpio.testdir with empty x and y hardlinks
@@ -36,7 +37,6 @@ ls -ln cpio.testdir | $FILTER_LS" \
36"\ 37"\
371 blocks 381 blocks
380 390
39total 0
40-rw-r--r-- 2 $user $group 0 x 40-rw-r--r-- 2 $user $group 0 x
41-rw-r--r-- 2 $user $group 0 y 41-rw-r--r-- 2 $user $group 0 y
42" \ 42" \
@@ -75,7 +75,6 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
75"\ 75"\
762 blocks 762 blocks
770 770
78total 8
79-rw-r--r-- 2 $user $group 0 empty 78-rw-r--r-- 2 $user $group 0 empty
80-rw-r--r-- 2 $user $group 0 empty1 79-rw-r--r-- 2 $user $group 0 empty1
81-rw-r--r-- 2 $user $group 2 nonempty 80-rw-r--r-- 2 $user $group 2 nonempty