[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1291-g9b85896

[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=9b85896d1902e77dfda90a311e5115078c474c2b

The branch, testsuite-work has been updated
       via  9b85896d1902e77dfda90a311e5115078c474c2b (commit)
       via  371bdf6bf8b61c3b78c8915068b5b806ec2b62cf (commit)
       via  8bae346819ce77fa3d653af4abfc6f1da9788303 (commit)
       via  3c99e9dca034ba5cbe3848af024aea5b4fc19b6c (commit)
       via  eda087adfd260504766cf0667fac4dc80e2c0b91 (commit)
       via  884694a8f84f97a584334fd58048be3de51b001a (commit)
      from  d6c60545ff41d153152c5a542cf723fd163c65ee (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 9b85896d1902e77dfda90a311e5115078c474c2b
Merge: d6c6054 371bdf6
Author: Stefano Lattarini <address@hidden>
Date:   Tue Sep 6 11:04:49 2011 +0200

    Merge branch 'test-protocols' into testsuite-work
    
    * test-protocols:
      * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
      fix: list test 'vala-vpath.test' in XFAIL_TESTS

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

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

diff --git a/ChangeLog b/ChangeLog
index 58ec84f..d7514e0 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 d166f25..4ca74d1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,6 +48,7 @@ gcj6.test \
 override-conditional-2.test \
 pr8365-remake-timing.test \
 yacc-dist-nobuild-subdir.test \
+vala-vpath.test \
 txinfo5.test
 
 # Some testsuite-influential variables should be overridable from the
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 21ee6ad..e2d3af8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -320,6 +320,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/amhello-binpkg.test b/tests/amhello-binpkg.test
index 00238e8..648858c 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -33,16 +33,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