Merge lp:~alan-griffiths/miral/script-testrun-with-xmir into lp:miral

[Alan Griffiths]

Script to initialize test environment with Xmir

[Alan Griffiths (alan-griffiths)]

<duflu> alan_g: That's the correct minimal syntax, yes, with two caveats: (1) The default renderer on desktop is dri2 which is less reliable so sometimes try -sw. (2) The -rootless option is not yet used by Unity8 but we hope to in future

review: Approve

=== modified file 'miral-shell/miral-run.sh'
--- miral-shell/miral-run.sh	2016-06-08 18:20:21 +0000
+++ miral-shell/miral-run.sh	2016-07-22 10:40:31 +0000
@@ -2,6 +2,5 @@
 if [ "$1" = "gnome-terminal" ]
 then extras='--app-id com.canonical.miral.Terminal'
 fi
-unset DISPLAY
 unset QT_QPA_PLATFORMTHEME
 GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir $* ${extras}&

=== modified file 'miral/runner.cpp'
--- miral/runner.cpp	2016-06-08 18:20:21 +0000
+++ miral/runner.cpp	2016-07-22 10:40:31 +0000
@@ -74,7 +74,6 @@
         }
         while (std::chrono::steady_clock::now() < time_limit);
 
-        unsetenv("DISPLAY");                                // Discourage toolkits from using X11
         setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
         setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
         unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme

=== added file 'scripts/testrun-with-xmir'
--- scripts/testrun-with-xmir	1970-01-01 00:00:00 +0000
+++ scripts/testrun-with-xmir	2016-07-22 10:40:31 +0000
@@ -0,0 +1,16 @@
+#! /bin/bash
+
+# Usage: testrun [<build dir> [<switches passed to miral-shell>]]
+
+socket=${XDG_RUNTIME_DIR}/mir_socket
+xmir_display=:1
+builddir=$(dirname $0)/../build/
+if [ $# -gt 0 ]; then builddir=$1/; shift; fi
+
+if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
+
+sudo ls >> /dev/null
+sudo DISPLAY=${xmir_display} ${builddir}bin/miral-shell --vt 4 --arw-file --file ${socket} $* &
+while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
+Xmir ${xmir_display} -rootless&
+DISPLAY=${xmir_display} ${builddir}bin/miral-run gnome-terminal&