[clutter/wip/neil/wayland-compositor: 1/4] test-wayland-surface: Fix the hardcoded paths

[Neil Roberts <nroberts src gnome org>]

commit cca20c1b4e7571d165768ddebe30349ab500dd12
Author: Neil Roberts <neil linux intel com>
Date:   Wed Dec 21 12:07:56 2011 +0000

    test-wayland-surface: Fix the hardcoded paths
    
    The hardcoded paths for launching X were wrong so it wasn't working

 tests/interactive/test-wayland-surface.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/tests/interactive/test-wayland-surface.c b/tests/interactive/test-wayland-surface.c
index 5bcc89c..0e24af9 100644
--- a/tests/interactive/test-wayland-surface.c
+++ b/tests/interactive/test-wayland-surface.c
@@ -739,8 +739,8 @@ start_xwayland (TWSCompositor *compositor)
           display_name = g_strdup_printf (":%d",
                                           compositor->xwayland_display_index);
 
-          if (execl ("/home/bob/local/xserver-xwayland/bin/X",
-                     "/home/bob/local/xserver-xwayland/bin/X",
+          if (execl ("/home/neil/local/xserver/bin/X",
+                     "/home/neil/local/xserver/bin/X",
                      display_name,
                      "-wayland",
                      "-rootless",
@@ -750,6 +750,11 @@ start_xwayland (TWSCompositor *compositor)
                      "-logfile", "/tmp/xwayland.log",
                      "-nolisten", "all",
                      "-terminate",
+                     "-modulepath",
+                     "/home/neil/local/xserver/lib/xorg/modules,"
+                     "/home/neil/local/xf86-video-intel/lib/xorg/modules",
+                     "-xkbdir",
+                     "/home/neil/local/xkeyboard-config/share/X11/xkb",
                      NULL) < 0)
             {
               char *msg = strerror (errno);