On Thu, Nov 10, 2016 at 11:57:44AM +0200, Pekka Paalanen wrote: > From: Pekka Paalanen <[email protected]> > > If you assign TESTS into check_PROGRAMS, you cannot add a test that is > not built from source files. > > Instead, use a temporary variable built_test_programs to hold the names > that are both programs built from source files and tests to execute. > > This change is required by the following patch adding wayland-scanner > test script. > > Signed-off-by: Pekka Paalanen <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> On that note: I always prefer to build tests as noinst_PROGRAMS rather than check_PROGRAMS to make sure they always build, regardless of someone running make check or not. Cheers, Peter > --- > Makefile.am | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 3eb6fd5..d35231c 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -144,7 +144,7 @@ libwayland_cursor_la_CFLAGS = \ > -DICONDIR=\"$(ICONDIR)\" > > > -TESTS = \ > +built_test_programs = \ > array-test \ > client-test \ > display-test \ > @@ -165,11 +165,13 @@ TESTS = \ > protocol-logger-test > > if ENABLE_CPP_TEST > -TESTS += cpp-compile-test > +built_test_programs += cpp-compile-test > endif > > +TESTS = $(built_test_programs) > + > check_PROGRAMS = \ > - $(TESTS) \ > + $(built_test_programs) \ > exec-fd-leak-checker > > noinst_PROGRAMS = \ > -- > 2.7.3 > > _______________________________________________ > wayland-devel mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/wayland-devel > _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
