Adapt du's no-x test not to fail on older Linux systems.

* tests/du/no-x: Accept a third variant of the diagnostic.

diff --git a/ChangeLog b/ChangeLog
index 4d19371b1230638c6b03c33ebaaafd6b604b2650..40cf00bb41afd7bde26aae669fdc88d672d78332 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-02  Jim Meyering  <jim@meyering.net>
+
+       Adapt du's no-x test not to fail on older Linux systems.
+       * tests/du/no-x: Accept a third variant of the diagnostic.
+
 2007-07-31  Jim Meyering  <jim@meyering.net>
 
        du: print size (probably incomplete) of each inaccessible directory

diff --git a/tests/du/no-x b/tests/du/no-x
index 00aea6a343d71c4b89b825c1f30213c59b7548db..f6b59974a6ad4014c312d55c1e81f4e2dd5670d4 100755 (executable)
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -2,7 +2,7 @@
 # Make sure du gives the right diagnostic for a readable,
 # but inaccessible directory.
 
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,25 +46,22 @@ fail=0
 # This must exit nonzero.
 du d >/dev/null 2>out && fail=1
 
+# Depending on whether du/fts is using native fdopendir, we see one
+# of the following diagnostics (note also the /y suffix in one case):
+#   du: `d/no-x': Permission denied
+#   du: cannot access `d/no-x/y': Permission denied
+#   du: cannot read directory `d/no-x': Permission denied
+# Convert either of the latter two to the first one.
+
+sed 's/^du: cannot access /du: /' out > t && mv t out
+sed 's/^du: cannot read directory /du: /' out > t && mv t out
+sed 's,d/no-x/y,d/no-x,' out > t && mv t out
+
 cat <<\EOF > exp
 du: `d/no-x': Permission denied
 EOF
 
-# With native fdopendir, du uses a different code path.
-cat <<\EOF > exp-native-fdopendir
-du: cannot access `d/no-x/y': Permission denied
-EOF
-
-if cmp out exp >/dev/null 2>&1; then
-  :
-else
-  if cmp out exp-native-fdopendir; then
-    :
-  else
-    fail=1
-  fi
-fi
-
+cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
 (exit $fail); exit $fail