Adjust the other two "no-x" tests and unify all three.

* tests/du/no-x: Factor out du-specific bits.
* tests/chmod/no-x: Use the same code.
* tests/chgrp/no-x: Use the same code.

3 files changed, 42 insertions, 44 deletions

diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x
index 117ac5773..58ac089c7 100755
--- a/tests/chgrp/no-x
+++ b/tests/chgrp/no-x
@@ -2,7 +2,7 @@
 # Make sure chgrp 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
@@ -50,25 +50,24 @@ fail=0
 
 # This must exit nonzero.
 chgrp -R $g2 d >/dev/null 2>out && fail=1
-cat <<\EOF > exp
-chgrp: `d/no-x': Permission denied
-EOF
 
-# With native fdopendir, du uses a different code path.
-cat <<\EOF > exp-native-fdopendir
-chgrp: cannot access `d/no-x/y': Permission denied
+prog=chgrp
+# NOTE: this code is the same for all tests/*/no-x tests.
+# Depending on whether fts is using native fdopendir, we see one
+# of the following diagnostics (note also the /y suffix in one case):
+#   prog: `d/no-x': Permission denied
+#   prog: cannot access `d/no-x/y': Permission denied
+#   prog: cannot read directory `d/no-x': Permission denied
+# Convert either of the latter two to the first one.
+sed "s/^$prog: cannot access /$prog: /" out > t && mv t out
+sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out
+sed 's,d/no-x/y,d/no-x,' out > t && mv t out
+
+cat <<EOF > exp
+$prog: \`d/no-x': 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
diff --git a/tests/chmod/no-x b/tests/chmod/no-x
index b61f4f8ef..34abba9cc 100755
--- a/tests/chmod/no-x
+++ b/tests/chmod/no-x
@@ -2,7 +2,7 @@
 # Make sure chmod 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,23 @@ fail=0
 # This must exit nonzero.
 chmod -R o=r d >/dev/null 2>out && fail=1
 
-cat <<\EOF > exp
-chmod: `d/no-x': Permission denied
+prog=chmod
+# NOTE: this code is the same for all tests/*/no-x tests.
+# Depending on whether fts is using native fdopendir, we see one
+# of the following diagnostics (note also the /y suffix in one case):
+#   prog: `d/no-x': Permission denied
+#   prog: cannot access `d/no-x/y': Permission denied
+#   prog: cannot read directory `d/no-x': Permission denied
+# Convert either of the latter two to the first one.
+sed "s/^$prog: cannot access /$prog: /" out > t && mv t out
+sed "s/^$prog: cannot read directory /$prog: /" out > t && mv t out
+sed 's,d/no-x/y,d/no-x,' out > t && mv t out
+
+cat <<EOF > exp
+$prog: \`d/no-x': Permission denied
 EOF
 
-# With native fdopendir, du uses a different code path.
-cat <<\EOF > exp-native-fdopendir
-chmod: 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
 
 mkdir -p a/b
diff --git a/tests/du/no-x b/tests/du/no-x
index f6b59974a..45cdb0d12 100755
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -46,19 +46,20 @@ 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
+prog=du
+# NOTE: this code is the same for all tests/*/no-x tests.
+# Depending on whether 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
+#   prog: `d/no-x': Permission denied
+#   prog: cannot access `d/no-x/y': Permission denied
+#   prog: 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/^$prog: cannot access /$prog: /" out > t && mv t out
+sed "s/^$prog: cannot read directory /$prog: /" 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
+cat <<EOF > exp
+$prog: \`d/no-x': Permission denied
 EOF
 
 cmp out exp || fail=1