summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xtests/ls/stat-failed12
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5346af715..c74be133c 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 c038c3757..fc6abf3a2 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