From: Jim Meyering <meyering@fb.com>
Date: Sat, 25 May 2013 03:11:37 +0000 (-0700)
Subject: tests: fix an ls test not to fail when user or group name contains SP
X-Git-Tag: v8.22~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=909a0561de27e516f3dff8e4a79ce0add5ca148b;p=thirdparty%2Fcoreutils.git

tests: fix an ls test not to fail when user or group name contains SP

* tests/ls/block-size.sh (size_etc): The sed expression through which
we filtered the output of "ls -l ..." assumed that the user and group
name components of each line would not contain spaces.  Avoid the
problem by using -og instead of -l, thus not printing either of those
fields.  Adjust the sed expression accordingly.
---

diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh
index 2ae5a0c533..25a8c26e68 100755
--- a/tests/ls/block-size.sh
+++ b/tests/ls/block-size.sh
@@ -30,18 +30,18 @@ for size in 1024 4096 262144; do
 done
 touch -d '2001-01-01 00:00' file* || fail=1
 
-size_etc='s/[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'
+size_etc='s/[^ ]* *[^ ]* *//'
 
-ls -l * | sed "$size_etc" >../out || fail=1
-POSIXLY_CORRECT=1 ls -l * | sed "$size_etc" >>../out || fail=1
-POSIXLY_CORRECT=1 ls -k -l * | sed "$size_etc" >>../out || fail=1
+ls -og * | sed "$size_etc" >../out || fail=1
+POSIXLY_CORRECT=1 ls -og * | sed "$size_etc" >>../out || fail=1
+POSIXLY_CORRECT=1 ls -k -og * | sed "$size_etc" >>../out || fail=1
 
 for var in BLOCKSIZE BLOCK_SIZE LS_BLOCK_SIZE; do
   for blocksize in 1 512 1K 1KiB; do
     (eval $var=$blocksize && export $var &&
-     ls -l * &&
-     ls -l -k * &&
-     ls -l -k --block-size=$blocksize *
+     ls -og * &&
+     ls -og -k * &&
+     ls -og -k --block-size=$blocksize *
     ) | sed "$size_etc" >>../out || fail=1
   done
 done