From f1df5481b9a51023b46390d7730c3a401a00e9fd Mon Sep 17 00:00:00 2001 From: Stefano Lattarini 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. Cherry picked from commit v1.11-1675-g104f302. --- tests/get-sysconf.test | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test index 1a549a3f7..bad4735d9 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 -- 2.47.2