From: Jim Meyering <jim@meyering.net>
Date: Wed, 26 Jul 2006 14:35:19 +0000 (+0000)
Subject: * tests/ls/stat-failed: Adapt to match new expected output.
X-Git-Tag: v6.0~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f418ef97df8b0342395e4a2d0d2f9f24a90f653;p=thirdparty%2Fcoreutils.git

* tests/ls/stat-failed: Adapt to match new expected output.
From Paul Eggert.
---

diff --git a/ChangeLog b/ChangeLog
index 5346af7154..c74be133c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-26  Jim Meyering  <jim@meyering.net>
 
+	* tests/ls/stat-failed: Adapt to match new expected output.
+	From Paul Eggert.
+
 	* src/ls.c (print_color_indicator): Test for S_IFREG first, rather
 	than having the code test for all of the other types first.
 	Hoist the set-uid/gid-testing code "up" into this new block.
diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed
index c038c37570..fc6abf3a28 100755
--- a/tests/ls/stat-failed
+++ b/tests/ls/stat-failed
@@ -35,24 +35,24 @@ test $? = 1 || fail=1
 
 cat <<\EOF > exp || fail=1
 total 0
-?--------- ? ?            ? s
+?????????? ? ?            ? s
 EOF
 
-cmp out exp || fail=1
+sed 's/^l/?/' out | cmp - exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
 # Ensure that the offsets in --dired output are accurate.
 rm -f out exp
-ls --dired -il d > out 2> /dev/null && fail=1
+ls --dired -l d > out 2> /dev/null && fail=1
 
 cat <<\EOF > exp || fail=1
   total 0
-  ? ?--------- ? ? ? ?            ? s
-//DIRED// 46 47
+  ?????????? ? ? ? ?            ? s
+//DIRED// 44 45
 //DIRED-OPTIONS// --quoting-style=literal
 EOF
 
-cmp out exp || fail=1
+sed 's/^  l/  ?/' out | cmp - exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
 (exit $fail); exit $fail