From c71a8929f506b1dab3ba24d11447d45548fb981a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 12 Jan 2013 14:41:18 +0100 Subject: [PATCH] tests: subobj-c.sh: fix post-merge spurious failure * t/subobj-c.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-c.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/subobj-c.sh b/t/subobj-c.sh index 41783e1d1..0827b53ed 100755 --- a/t/subobj-c.sh +++ b/t/subobj-c.sh @@ -68,12 +68,14 @@ int answer (void) } END +rm -f compile # We want to check '--add-missing' installs this. + $ACLOCAL $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 $EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && exit 1 -- 2.47.2