diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-11-09 17:16:51 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-11-16 13:23:43 +0200 |
| commit | edd62e62b77061ed09c34bf9e964ddcc6c08c88e (patch) | |
| tree | 9cad504315873ee3eff27ae0bf706db26bb0ea6a /Makefile.am | |
| parent | tests: Test wl_message_count_arrays (diff) | |
| download | wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar.gz wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar.bz2 wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar.lz wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar.xz wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.tar.zst wayland-edd62e62b77061ed09c34bf9e964ddcc6c08c88e.zip | |
Makefile: do not put TESTS into check_PROGRAMS
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 <pekka.paalanen@collabora.co.uk>
Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files 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 = \ |