diff options
author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-05-07 16:26:29 +0300 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-05-09 15:00:36 -0700 |
commit | f9a2626cb1be298b297ed0e07b56e1a12335c2b5 (patch) | |
tree | ec8f36fa307d12f9986275b032bd89222eca7311 | |
parent | c2b74fb849930d4d845c4dc984a53abccd154148 (diff) | |
download | weston-f9a2626cb1be298b297ed0e07b56e1a12335c2b5.tar.gz weston-f9a2626cb1be298b297ed0e07b56e1a12335c2b5.tar.bz2 weston-f9a2626cb1be298b297ed0e07b56e1a12335c2b5.zip |
tests: rename xwayland test
If the test is named xwayland.weston, then the automake test harness
keys it off xwayland.log. Making xwayland.log runs the test.
The test harness has implicit rules to create a %.log from all of
%$TEST_EXTENSIONS. So we have implicit rules to create %.log from %.la
and %.log from %.weston.
We also build xwayland.so, which produces xwayland.la.
When the test harness goes running the xwayland test, it ends up using
the %.la rule, which is wrong. It passes xwayland.la as the test name to
weston-tests-env, which then loads it as a plugin into Weston and waits
for Weston to exit. Which it never does.
Fix this by making the test have a different name than the Xwayland
plugin.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a247c3d4..177ce2e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -927,10 +927,10 @@ buffer_count_weston_LDADD = libtest-client.la $(EGL_TESTS_LIBS) endif if ENABLE_XWAYLAND_TEST -weston_tests += xwayland.weston -xwayland_weston_SOURCES = tests/xwayland-test.c -xwayland_weston_CFLAGS = $(GCC_CFLAGS) $(XWAYLAND_TEST_CFLAGS) -xwayland_weston_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS) +weston_tests += xwayland-test.weston +xwayland_test_weston_SOURCES = tests/xwayland-test.c +xwayland_test_weston_CFLAGS = $(GCC_CFLAGS) $(XWAYLAND_TEST_CFLAGS) +xwayland_test_weston_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS) endif matrix_test_SOURCES = \ |