summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Shanks <bshanks@codeweavers.com>2019-08-05 11:19:56 -0700
committerJeremy White <jwhite@codeweavers.com>2019-08-05 16:20:48 -0500
commite2bcd346cd425593bf0539844d62a1847cda5f4c (patch)
tree5073f9e895382a031485af1361c134dcc3dddf5a
parentc8cd5f9c7857d24716358a8f934cf9bdae8a5de5 (diff)
Fix running tests on Debian/Ubuntu
Check the Debian/Ubuntu path for the non-wrapper Xorg binary Signed-off-by: Brendan Shanks <bshanks@codeweavers.com> Acked-by: Jeremy White <jwhite@codeweavers.com>
-rw-r--r--src/tests/xdummy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tests/xdummy.c b/src/tests/xdummy.c
index 0651dc7..ce57b1c 100644
--- a/src/tests/xdummy.c
+++ b/src/tests/xdummy.c
@@ -157,6 +157,8 @@ static int exec_xorg(xdummy_t *server, gconstpointer user_data G_GNUC_UNUSED)
strcpy(xorg_binary, "Xorg");
if (access("/usr/libexec/Xorg", X_OK) == 0)
strcpy(xorg_binary, "/usr/libexec/Xorg");
+ else if (access("/usr/lib/xorg/Xorg", X_OK) == 0)
+ strcpy(xorg_binary, "/usr/lib/xorg/Xorg");
return execlp(xorg_binary, xorg_binary, "-ac",
"-config", server->xorg_fname,