From 2295a62788d7d8b279cc683144f09356a11cead2 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 29 Nov 2016 11:05:49 +0000 Subject: [PATCH] tests: Skip Xwayland test if binary isn't available We know we're not going to succeed if the binary isn't installed, so skip the test in that case. Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer --- Makefile.am | 3 ++- tests/xwayland-test.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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);