[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-633-gf1df548

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

The branch, maint has been updated
       via  f1df5481b9a51023b46390d7730c3a401a00e9fd (commit)
      from  e064ff7997a1425942fe32c0c0488f922fe1ea9a (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 f1df5481b9a51023b46390d7730c3a401a00e9fd
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 1 19:06:00 2012 +0100

    tests: fix spurious failure of 'get-sysconf.test'
    
    * tests/get-sysconf.test: Do not assume that a ChangeLog file exists
    in $(srcdir): now that the ChangeLog is autogenerated and not under
    version control anymore, this is not necessary true.  Instead, if we
    are running from a git checkout, use "git log" to get information on
    the version of the automake snapshot being tested (and fall back on
    extracting the first ChangeLog entry otherwise).
    
    Reported by Jim Meyering in automake bug#10418.
    
    Cherry picked from commit v1.11-1675-g104f302.

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

Summary of changes:
 tests/get-sysconf.test |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 1a549a3..bad4735 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -30,7 +30,19 @@ testbuilddir=`(cd .. && pwd)`
 top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
 
 st=0
-sed 20q "$top_testsrcdir/ChangeLog" || st=1
+if test -d "$top_testsrcdir"/.git; then
+  # We are running from a git checkout.
+  git log -1 || st=1
+else
+  # We are probably running from a distribution tarball, so
+  # the ChangeLog file must be present.
+  awk '
+    BEGIN { first = 1 }
+    (first == 1) { print; first = 0; next; }
+    /^[^\t]/ { exit(0); }
+    { print }
+  ' "$top_testsrcdir"/ChangeLog || st=1
+fi
 $PERL -V || st=1
 cat "$top_testbuilddir/config.log" || st=1
 cat "$testbuilddir/aclocal-$APIVERSION" || st=1


hooks/post-receive
-- 
GNU Automake