Skip to content

Commit 42f959a

Browse files
vriesdavidmalcolm
authored andcommitted
Makefile: Fix testdemo for seperate build dir
Seperate build dir fixes for testdemo: - use -f to indicate Makefile location - fix egrep pattern to allow for full path demo.c - add sed to filter out dir of full path demo.c
1 parent a4ca611 commit 42f959a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,11 @@ testdemo: DEMO_REF=$(shell \
310310
echo demo.expected; \
311311
fi)
312312
testdemo: plugin print-gcc-version
313-
$(MAKE) demo > demo.out 2> demo.err
314-
egrep '^demo.c:( In function |[0-9][0-9]*:[0-9][0-9]*: warning:)' \
313+
$(MAKE) -f $(srcdir)./Makefile demo > demo.out 2> demo.err
314+
egrep '^.*demo.c:( In function |[0-9][0-9]*:[0-9][0-9]*: warning:)' \
315315
demo.err \
316316
| sed 's/:[0-9][0-9]*: warning:/:: warning:/;s/ \[enabled by default\]//' \
317+
| sed "s%$(srcdir)demo.c:%demo.c:%g" \
317318
> demo.filtered
318319
diff $(DEMO_REF) demo.filtered
319320
rm demo.out demo.err demo.filtered

0 commit comments

Comments
 (0)