From 3fe826bd5d1fafdcfff2b4feb5656f7fa0941cb4 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 12 Jan 2013 14:46:51 +0100 Subject: [PATCH] tests: subobj-libtool.sh: fix post-merge spurious failure * t/subobj-libtool.sh: Remove the 'compile' script automatically brought in by 'test-init.sh', so that we can ensure "automake --add-missing" correctly installs it. While at it, make grepping of automake output slightly stricter. Signed-off-by: Stefano Lattarini --- t/subobj-libtool.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh index ab842342a..f0284d568 100755 --- a/t/subobj-libtool.sh +++ b/t/subobj-libtool.sh @@ -55,11 +55,11 @@ echo 'int three (void) { return 3; }' > sub/subsub/3.c libtoolize $ACLOCAL +# Make sure compile is installed, and that Automake says so. +rm -f compile $AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; } cat stderr >&2 - -# Make sure compile is installed, and that Automake says so. -grep 'install.*compile' stderr +grep '^configure\.ac:4:.*install.*compile' stderr test -f compile grep '[^/][123]\.lo' Makefile.in && exit 1 -- 2.47.2