mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2016-11-29 11:05:49 +00:00
parent beb97e5f79
commit 2295a62788
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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

3
tests/xwayland-test.c
View File

@ -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);