emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio test: fix false positive with DESKTOP off

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-03-28 20:07:42 +02:00
parent 4816fe9179
commit 03f6ee28d6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testsuite/cpio.tests
View File

@ -7,7 +7,8 @@
# ls -ln shows date. Need to remove that, it's variable. # ls -ln shows date. Need to remove that, it's variable.
# sed: coalesce spaces # sed: coalesce spaces
# cut: remove date # 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 # 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 1 blocks
0 0
total 0
-rw-r--r-- 2 $user $group 0 x -rw-r--r-- 2 $user $group 0 x
-rw-r--r-- 2 $user $group 0 y -rw-r--r-- 2 $user $group 0 y
" \ " \
@ -75,7 +75,6 @@ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
"\ "\
2 blocks 2 blocks
0 0
total 8
-rw-r--r-- 2 $user $group 0 empty -rw-r--r-- 2 $user $group 0 empty
-rw-r--r-- 2 $user $group 0 empty1 -rw-r--r-- 2 $user $group 0 empty1
-rw-r--r-- 2 $user $group 2 nonempty -rw-r--r-- 2 $user $group 2 nonempty