summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--tests/xwayland-test.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b7eefd86..2219e3d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1354,7 +1354,8 @@ endif
if ENABLE_XWAYLAND_TEST
weston_tests += xwayland-test.weston
xwayland_test_weston_SOURCES = tests/xwayland-test.c
-xwayland_test_weston_CFLAGS = $(AM_CFLAGS) $(XWAYLAND_TEST_CFLAGS)
+xwayland_test_weston_CFLAGS = \
+ $(AM_CFLAGS) $(XWAYLAND_TEST_CFLAGS) -DXSERVER_PATH='"@XSERVER_PATH@"'
xwayland_test_weston_LDADD = libtest-client.la $(XWAYLAND_TEST_LIBS)
endif
diff --git a/tests/xwayland-test.c b/tests/xwayland-test.c
index af306c12..d9d4a2d6 100644
--- a/tests/xwayland-test.c
+++ b/tests/xwayland-test.c
@@ -53,6 +53,9 @@ TEST(xwayland_client_test)
Atom atom, type_atom, actual_type;
char *wm_name;
+ if (access(XSERVER_PATH, X_OK) != 0)
+ exit(77);
+
display = XOpenDisplay(NULL);
if (!display)
exit(EXIT_FAILURE);