tests: avoid spurious failure of 'uninstall-fail.test' on Solaris

* tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
/bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
directory with the `cd' builtin, print a message like:
  "sh: /root: permission denied"
which doesn't report the `cd' builtin anywhere.  Relax the grepping
of the error message accordingly.

diff --git a/ChangeLog b/ChangeLog
index 6d63637259d52a8cce5e74d14be48f94acff942c..16f72e423e031029bc36e4e18c870c7d31dab6ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: avoid spurious failure of 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: All the Solaris 10 shells (/bin/sh,
+       /bin/ksh, and /usr/xpg4/bin/sh), upon failing to chdir to a
+       directory with the `cd' builtin, print a message like:
+         "sh: /root: permission denied"
+       which doesn't report the `cd' builtin anywhere.  Relax the grepping
+       of the error message accordingly.
+
 2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin

diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index a57b6652fc593dd0bd1eee6e2e9738064a1bd3e5..14a843b2f444839c177b14ef301b7eadca6d5093 100755 (executable)
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -60,7 +60,8 @@ chmod a-rwx $inst/share
 
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat output
-grep "cd: .*$inst/share" output
-
+# Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report
+# the name of the `cd' builtin upon a chdir error.
+$EGREP "(cd|sh): .*$inst/share" output
 
 :