Hi Jim, thanks for the report.

> Building on master, v1.11-1673-gc1b14e9,
> I saw one "ERROR" and 10 failures.
>
> The ERROR is trivial to fix.  Patch below.
>
I pushed a slightly more elaborated version (see attachment).

Regards,
  Stefano
>From 104f3027a7f0d0d4dc0f01e786f7deec9707a863 Mon Sep 17 00:00:00 2001
Message-Id: <104f3027a7f0d0d4dc0f01e786f7deec9707a863.1325441627.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sun, 1 Jan 2012 19:06:00 +0100
Subject: [PATCH] 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.
---
 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 fe78d70..039a436 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -23,7 +23,19 @@
 . ./defs || Exit 1
 
 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
-- 
1.7.7.3

Reply via email to