[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-452-g8781adb

[Ralf Wildenhues]

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=8781adb9f67b421873e3c4a9a92088f65380ed7f

The branch, master has been updated
       via  8781adb9f67b421873e3c4a9a92088f65380ed7f (commit)
       via  a4e89e7dd3f7f4cfad037cd4392b91fc22892f6d (commit)
       via  3616946d61720db601c70bf986207654d9fde6f1 (commit)
       via  c4d75f3e54949a6862e593d56a5de74ed1510801 (commit)
      from  a190f54853f2c5c4a1d2403ae0b18b588537ae65 (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 8781adb9f67b421873e3c4a9a92088f65380ed7f
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Nov 16 19:23:09 2010 +0100

    backcompat5.test: avoid '##'-style comments inside recipe commands.
    
    * tests/backcompat5.test: Remove double-hash comments
    from makefile rule commands, they are not part of the
    Automake API.  Fixes testsuite failure with Tru64 make.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit a4e89e7dd3f7f4cfad037cd4392b91fc22892f6d
Merge: a190f54 3616946
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Nov 16 19:23:41 2010 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog              |   18 ++++++++++++++++++
 tests/backcompat5.test |    2 +-
 tests/color.test       |    2 +-
 tests/color2.test      |    2 +-
 tests/confh.test       |    4 ++--
 tests/confh8.test      |    4 ++--
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e7b050..ed10bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-16  Ralf Wildenhues  <address@hidden>
+
+       backcompat5.test: avoid '##'-style comments inside recipe commands.
+       * tests/backcompat5.test: Remove double-hash comments
+       from makefile rule commands, they are not part of the
+       Automake API.  Fixes testsuite failure with Tru64 make.
+
+       tests: avoid '##'-style comments inside recipe commands.
+       * tests/confh.test, tests/confh8.test: Remove
+       double-hash comments from makefile rule commands, they
+       are not part of the Automake API.
+
+2010-11-14  Ralf Wildenhues  <address@hidden>
+
+       tests: work around dash quoting issue in case statements.
+       * tests/color.test, tests/color2.test: Quote variable in case
+       pattern, to avoid skipping tests with dash 0.5.5.1.
+
 2010-11-16  Peter Rosin  <address@hidden>
 
        Skip MSVC oriented tests if the shell is not capable.
diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index b68316d..50538cc 100755
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -63,7 +63,7 @@ END
 
 cat >hacky/Makefile.am <<'END'
 dist-hook:
-       find $(top_distdir) -print ## useful for debugging
+       find $(top_distdir) -print
        chmod a+rx $(top_distdir)/tests/*.test
 END
 
diff --git a/tests/color.test b/tests/color.test
index 9d86785..c1032fd 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -34,7 +34,7 @@ std=''
 # BSD 'grep' works from a pipe, but not a seekable file.
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$std" | grep .` in
-  $std) ;;
+  "$std") ;;
   *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
diff --git a/tests/color2.test b/tests/color2.test
index eedd37d..306aa04 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -34,7 +34,7 @@ std=''
 # BSD 'grep' works from a pipe, but not a seekable file.
 # GNU or BSD 'grep -a' works on files, but is not portable.
 case `echo "$std" | grep .` in
-  $std) ;;
+  "$std") ;;
   *) echo "$me: grep can't parse nonprinting characters" >&2; Exit 77;;
 esac
 
diff --git a/tests/confh.test b/tests/confh.test
index 34674cc..93badef 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -30,10 +30,10 @@ END
 cat > Makefile.am << 'END'
 .PHONY: test1 test2
 test1:
-       @echo DIST_COMMON = $(DIST_COMMON) ## for debugging
+       @echo DIST_COMMON = $(DIST_COMMON)
        echo ' ' $(DIST_COMMON) ' ' | grep '[ /]acconfig\.h '
 test2: distdir
-       ls -l $(distdir)/* ## for debugging
+       ls -l $(distdir)/*
        test -f $(distdir)/acconfig.h
 check-local: test1 test2
 END
diff --git a/tests/confh8.test b/tests/confh8.test
index df985ec..146d2f0 100755
--- a/tests/confh8.test
+++ b/tests/confh8.test
@@ -29,7 +29,7 @@ END
 cat > Makefile.am << 'END'
 .PHONY: test0 test1 test2
 test0:
-       @echo DIST_COMMON = $(DIST_COMMON) ## for debugging
+       @echo DIST_COMMON = $(DIST_COMMON)
        echo ' ' $(DIST_COMMON) ' ' | grep '[ /]one\.h\.in '
        echo ' ' $(DIST_COMMON) ' ' | grep '[ /]two\.h\.in '
        : Processed header files should not be distributed.
@@ -42,7 +42,7 @@ test1: all
        test -f one.h
        test -f two.h
 test2: distdir
-       ls -l $(distdir)/* ## for debugging
+       ls -l $(distdir)/*
        test -f $(distdir)/one.h.in
        test -f $(distdir)/two.h.in
        : Processed header files should not be distributed.


hooks/post-receive
-- 
GNU Automake