[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-536-geaa5372

[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=eaa53725d148cbda064fc598aa6a2a422e9cc422

The branch, maint has been updated
       via  eaa53725d148cbda064fc598aa6a2a422e9cc422 (commit)
       via  75ae56f04be065936501f579ad1aa999f5b19b3b (commit)
      from  eae36caf547319469b378d12b90a9f82338fa322 (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 eaa53725d148cbda064fc598aa6a2a422e9cc422
Author: Stefano Lattarini <address@hidden>
Date:   Sun Nov 13 10:25:43 2011 +0100

    tests: fix spurious failure with older install-info
    
    * tests/install-info-dir.test (foo.texi): Also add proper
    address@hidden', address@hidden' and address@hidden' directive, otherwise
    older versions of `install-info' (e.g., 4.8) will fail to create
    the `dir' index file in ${infodir}.
    
    Problem revealed by a failure on NetBSD 5.1.

commit 75ae56f04be065936501f579ad1aa999f5b19b3b
Author: Stefano Lattarini <address@hidden>
Date:   Sat Nov 12 22:24:36 2011 +0100

    maintcheck: fix spurious failure in 'color2.test'
    
    * tests/color2.test: Avoid creative quoting to avoid a spurious
    failure of the `sc_tests_Exit_not_exit' maintainer check.

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

Summary of changes:
 ChangeLog                   |   15 +++++++++++++++
 tests/color2.test           |    3 ++-
 tests/install-info-dir.test |    8 ++++++++
 3 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8934813..1e624a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-13  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with older install-info
+       * tests/install-info-dir.test (foo.texi): Also add proper
+       address@hidden', address@hidden' and address@hidden' directive, 
otherwise
+       older versions of `install-info' (e.g., 4.8) will fail to create
+       the `dir' index file in ${infodir}.
+       Problem revealed by a failure on NetBSD 5.1.
+
+2011-11-12  Stefano Lattarini  <address@hidden>
+
+       maintcheck: fix spurious failure in 'color2.test'
+       * tests/color2.test: Avoid creative quoting to avoid a spurious
+       failure of the `sc_tests_Exit_not_exit' maintainer check.
+
 2011-11-12  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious error in 'uninstall-fail.test' on Solaris
diff --git a/tests/color2.test b/tests/color2.test
index 2217d88..bc97313 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -39,7 +39,8 @@ case `echo "$std" | grep .` in
 esac
 
 # This test requires a working a working `expect' program.
-(set +e; expect -c "exit 77"; test $? -eq 77) \
+# Creative quoting required to avoid spurious maintainer-check failure.
+(set +e; expect -c 'exit ''77'; test $? -eq 77) \
   || skip_ "requires a working expect program"
 
 # Also, if the $MAKE program fails to consider the standard output as a
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index f75b115..044bf6d 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -43,6 +43,14 @@ END
 cat > foo.texi << 'END'
 \input texinfo
 @setfilename foo.info
address@hidden All the following directives might be required to allow older
address@hidden versions of the `install-info' program (e.g., version 4.8) to
address@hidden create the `dir' index file in ${infodir}.  Don't remove them.
address@hidden foo
address@hidden Dummy utilities
address@hidden
+* Foo: (foo).  Does nothing at all, but has a nice name.
address@hidden direntry
 @node Top
 Hello world!
 @bye


hooks/post-receive
-- 
GNU Automake