[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-996-g6a50baf

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6a50baf30f92cdcb393f801e8265eddf17ce00ac

The branch, test-protocols has been updated
       via  6a50baf30f92cdcb393f801e8265eddf17ce00ac (commit)
       via  e171f615247e832582c4806016dc58be7e2f2594 (commit)
      from  2cf22db73f5374bd0f528abfaf65987eab12a665 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a50baf30f92cdcb393f801e8265eddf17ce00ac
Merge: 2cf22db e171f61
Author: Stefano Lattarini <address@hidden>
Date:   Tue Aug 9 15:27:30 2011 +0200

    Merge branch 'master' into test-protocols
    
    * master:
      testsuite: avoid spurious failure of self checks on Solaris

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   10 ++++++++++
 tests/self-check-dir.test  |    2 +-
 tests/self-check-exit.test |   14 ++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7b195f..03bd202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-09  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure of self checks on Solaris
+       This is just a quick workaround to prevent having too much noise
+       in the testsuite; more proper fixes have been committed into the
+       'testsuite-work' branch.
+       * tests/self-check-dir.test: Relax a test to avoid unimportant
+       failure on Solaris 10.
+       * tests/self-check-exit.test: Likewise.
+
 2011-08-08  Stefano Lattarini  <address@hidden>
 
        test defs: more environment cleanup
diff --git a/tests/self-check-dir.test b/tests/self-check-dir.test
index ba9fd29..013528e 100755
--- a/tests/self-check-dir.test
+++ b/tests/self-check-dir.test
@@ -31,7 +31,7 @@ rm -f $this.tmp
 $SHELL -c "
   . ./defs || Exit 1
   : > $this.tmp
-  case \`pwd\` in '`pwd`'/$this.dir);; *) Exit 1;; esac
+  case \`pwd\` in */$this.dir);; *) Exit 1;; esac
 " $this.test || outcome=false
 
 test -f $this.tmp && { rm -f $this.tmp; outcome=false; }
diff --git a/tests/self-check-exit.test b/tests/self-check-exit.test
index 73f3ea5..ca1af9b 100755
--- a/tests/self-check-exit.test
+++ b/tests/self-check-exit.test
@@ -39,12 +39,14 @@ for st in 1 2 3 4 5 77 99 126 127 128 129 130 255; do
 
 done
 
-echo "* Try: non-existent-program"
-$SHELL -c  ". ./defs; non-existent-program; :"
-rc=$?
-echo "* rc=$rc"
-echo
-test $rc -eq 127 || exit 1
+# Disabled: some lesser shells such as Solaris /bin/sh might fail
+# on this.
+#echo "* Try: non-existent-program"
+#$SHELL -c  ". ./defs; non-existent-program; :"
+#rc=$?
+#echo "* rc=$rc"
+#echo
+#test $rc -eq 127 || exit 1
 
 for sig in 1 2 13 15; do
 


hooks/post-receive
-- 
GNU Automake