automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tests: fix spurious error in 'uninstall-fail.test' on Solaris


From: Stefano Lattarini
Subject: [PATCH] tests: fix spurious error in 'uninstall-fail.test' on Solaris
Date: Sat, 12 Nov 2011 19:30:41 +0100

* tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add
a line number before the `:' in the error messages issued by shell
builtins.  Account for that in our grepping of make output.
---
 ChangeLog                 |    7 +++++++
 tests/uninstall-fail.test |   19 +++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79bcb89..8934813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-11-12  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious error in 'uninstall-fail.test' on Solaris
+       * tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add
+       a line number before the `:' in the error messages issued by shell
+       builtins.  Account for that in our grepping of make output.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
        tests: fix typo in 'uninstall-fail.test'
        * tests/uninstall-fail.test: Always use `$rm_f_is_silent_on_error'
        instead of the bogus `$rm_f_is_silent_on_failure'.
diff --git a/tests/uninstall-fail.test b/tests/uninstall-fail.test
index 2fc3197..529d8f3 100755
--- a/tests/uninstall-fail.test
+++ b/tests/uninstall-fail.test
@@ -76,8 +76,23 @@ chmod a-rwx $inst/share
 
 $MAKE uninstall >output 2>&1 && { cat output; Exit 1; }
 cat 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
+# the name of the `cd' builtin upon a chdir error:
+#
+#   $ /bin/sh -c 'cd /none'
+#   /bin/sh: /none: does not exist
+#
+# In addition, some shells, like Solaris 10 /usr/xpg4/bin/sh, also print
+# a line number in the error message *if the command contains newlines*:
+#
+#   $ /usr/xpg4/bin/sh -c 'cd unreadable'
+#   /usr/xpg4/bin/sh: unreadable: permission denied
+#   $ /usr/xpg4/bin/sh -c '\
+#   > \
+#   > cd unreadable'
+#   /usr/xpg4/bin/sh[3]: unreadable: permission denied
+#
+$EGREP "(cd|sh)(\[[0-9]*[0-9]\])?: .*$inst/share" output
 
 :
-- 
1.7.2.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]