[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-960-g8bae346

[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=8bae346819ce77fa3d653af4abfc6f1da9788303

The branch, master has been updated
       via  8bae346819ce77fa3d653af4abfc6f1da9788303 (commit)
       via  3c99e9dca034ba5cbe3848af024aea5b4fc19b6c (commit)
       via  eda087adfd260504766cf0667fac4dc80e2c0b91 (commit)
       via  884694a8f84f97a584334fd58048be3de51b001a (commit)
      from  7ce19f110c1420531ff39a97ce710bad972f776d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    9 +++++++++
 tests/Makefile.am         |    1 +
 tests/Makefile.in         |    2 +-
 tests/amhello-binpkg.test |    8 +++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68db5c4..5b9f6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-05  Peter Rosin  <address@hidden>
+
+       * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
+
+2011-09-04  Stefano Lattarini  <address@hidden>
+
+       fix: list test 'vala-vpath.test' in XFAIL_TESTS
+       * tests/Makefile.am (XFAIL_TESTS): Update.
+
 2011-09-02  Stefano Lattarini  <address@hidden>
 
        tests: simplify wrapper for aclocal
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a2b7b16..c3ea49a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,6 +27,7 @@ gcj6.test \
 override-conditional-2.test \
 pr8365-remake-timing.test \
 yacc-dist-nobuild-subdir.test \
+vala-vpath.test \
 txinfo5.test
 
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9819306..d08323e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -298,7 +298,7 @@ EXTRA_DIST = ChangeLog-old gen-parallel-tests 
instspc-tests.sh \
        $(TESTS)
 XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
        override-conditional-2.test pr8365-remake-timing.test \
-       yacc-dist-nobuild-subdir.test txinfo5.test \
+       yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \
        $(instspc_xfail_tests)
 parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \
        check-exported-srcdir-p.test check-tests-in-builddir-p.test \
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index f11421f..59813cc 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -34,16 +34,18 @@ cd inst
 find . -type f -print > ../files.lst
 tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > tar.got 2>&1
 
+EXEEXT=`sed -n -e 's/^EXEEXT *= *//p' < ../Makefile`
+
 if tar --version </dev/null | grep GNU; then
   LC_ALL=C sort tar.got > t
   mv -f t tar.got
-  diff - tar.got <<'END'
-./usr/bin/hello
+  diff - tar.got <<END
+./usr/bin/hello$EXEEXT
 ./usr/share/doc/amhello/README
 END
 else
   : Be laxer with other tar implementations, to avoid spurious failures.
-  $EGREP '(^| )\./usr/bin/hello( |$)' tar.got
+  $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got
   $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
 fi
 


hooks/post-receive
-- 
GNU Automake