Merge lp:~ted/ubuntu-app-launch/xmir-support into lp:ubuntu-app-launch/15.10

[Ted Gould]

Start XMir for applications that enable it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/7/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

This was discussed on IRC, but I'll put it here as well for the record.

The crash seen in bug #1472097 is due to the '-rootless' option passed to Xmir. For a final solution, '-rootless' is desired, but short term, we need to figure out whether '-rootless' can be fixed in fairly quick manner or if it needs to be removed from this MP.

As this MP needs to land soon for PD, we need to figure out which option is best for the short term.

Aside from the '-rootless' issue, looks good and works well once I removed '-rootless' in my test.

review: Needs Information

[lp:~ted/ubuntu-app-launch/xmir-support]

135. By Ted Gould on 2015-08-06

Remove the -rootless flag

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/9/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Suggestions/questions inline

[Ted Gould (ted)]

On Mon, 2015-08-10 at 19:12 +0000, Charles Kerr wrote:

> > +TEST_F(ExecUtil, DesktopNoMir)
>
> This is so similar to the previous test, seems like a good candidate for extract-method

Done, now this test takes forever to compile :-)

> > + if (argc < 3) {
> > + fprintf(stderr, "xmir-helper needs more arguments: xmir-helper $(appid) $(thing to exec)\n");
>
> might append "..." to make varargs explicit

Fixed. r139

> > + return 1;
> > + }
> > +
> > + /* Make nice variables for the things we need */
> > + char * appid = argv[1];
> > + char * xmir = getenv("UBUNTU_APP_LAUNCH_XMIR_PATH");
>
> appid and xmir should both be const
>
> also, g_getenv() returns a const gchar* so this should have warned -- do you have warnings turned off in the tests dir?

Verified that we're -Wall and -Werror. But we're using getenv() here so
it's not returning const. Which turns out to be a good thing where in
that exec() can't take a const array. Eh, stdlib :-(

[lp:~ted/ubuntu-app-launch/xmir-support]

136. By Ted Gould on 2015-08-11

Refactor test into a helper function

137. By Ted Gould on 2015-08-11

Porting some more cases

138. By Ted Gould on 2015-08-11

Changing the click mir tests over

139. By Ted Gould on 2015-08-11

Mention varargs

140. By Ted Gould on 2015-08-11

Remove std=c11

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/13/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Approved wrt the glib and testing; not reviewing Townsend's bits

review: Approve

[Christopher Townsend (townsend)]

This works now.

Note: I did see a crash when starting an app, but I think it's due to something else, not this MP. Unfortunately, I cannot try to reproduce again as unity-system-compositor was transitioned before Mir and not the Unity 8 desktop session is broken.

review: Approve

[lp:~ted/ubuntu-app-launch/xmir-support]

141. By Ted Gould on 2015-08-17

Don't set a default value for XMIR_ENABLE

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-19 22:33:37 +0000
+++ CMakeLists.txt	2015-08-17 21:35:03 +0000
@@ -79,7 +79,9 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
+add_definitions( -DXMIR_HELPER="${pkglibexecdir}/xmir-helper" )
 
 ####################
 # Helpers
@@ -136,6 +138,14 @@
 install(TARGETS application-failed RUNTIME DESTINATION "${pkglibexecdir}")
 
 ####################
+# xmir-helper
+####################
+
+add_executable(xmir-helper xmir-helper.c)
+set_target_properties(xmir-helper PROPERTIES OUTPUT_NAME "xmir-helper")
+install(TARGETS xmir-helper RUNTIME DESTINATION "${pkglibexecdir}")
+
+####################
 # untrusted-helper-type-end
 ####################
 

=== modified file 'exec-line-exec-trace.tp'
--- exec-line-exec-trace.tp	2014-08-11 17:19:57 +0000
+++ exec-line-exec-trace.tp	2015-08-17 21:35:03 +0000
@@ -5,6 +5,12 @@
 		ctf_string(appid, appid)
 	)
 )
+TRACEPOINT_EVENT(ubuntu_app_launch, exec_parse_complete,
+	TP_ARGS(const char *, appid),
+	TP_FIELDS(
+		ctf_string(appid, appid)
+	)
+)
 TRACEPOINT_EVENT(ubuntu_app_launch, exec_pre_exec,
 	TP_ARGS(const char *, appid),
 	TP_FIELDS(

=== modified file 'exec-line-exec.c'
--- exec-line-exec.c	2014-08-11 17:19:57 +0000
+++ exec-line-exec.c	2015-08-17 21:35:03 +0000
@@ -139,6 +139,20 @@
 		return 1;
 	}
 
+	ual_tracepoint(exec_parse_complete, app_id);
+
+	if (g_getenv("MIR_SOCKET") != NULL && g_strcmp0(g_getenv("APP_XMIR_ENABLE"), "1") == 0) {
+		g_debug("XMir Helper being used");
+
+		/* xmir-helper $(APP_ID) $(COMMAND) */
+		const gchar * appid = g_getenv("APP_ID");
+		g_array_prepend_val(newargv, appid);
+
+		/* Pulling into the heap instead of the code page */
+		char * xmir_helper = g_strdup(XMIR_HELPER);
+		g_array_prepend_val(newargv, xmir_helper);
+	}
+
 	/* Now exec */
 	gchar ** nargv = (gchar**)g_array_free(newargv, FALSE);
 

=== modified file 'libubuntu-app-launch/click-exec.c'
--- libubuntu-app-launch/click-exec.c	2014-08-22 21:04:13 +0000
+++ libubuntu-app-launch/click-exec.c	2015-08-17 21:35:03 +0000
@@ -136,6 +136,14 @@
 		return FALSE;
 	}
 
+	if (g_key_file_has_key(keyfile, "Desktop Entry", "X-Ubuntu-XMir-Enable", NULL)) {
+		if (g_key_file_get_boolean(keyfile, "Desktop Entry", "X-Ubuntu-XMir-Enable", NULL)) {
+			env_handle_add(handle, "APP_XMIR_ENABLE", "1");
+		} else {
+			env_handle_add(handle, "APP_XMIR_ENABLE", "0");
+		}
+	}
+
 	/* This string is quoted using desktop file quoting:
 	   http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables */
 	gchar * exec = desktop_to_exec(keyfile, desktopfile);

=== modified file 'libubuntu-app-launch/desktop-exec.c'
--- libubuntu-app-launch/desktop-exec.c	2014-08-22 21:06:00 +0000
+++ libubuntu-app-launch/desktop-exec.c	2015-08-17 21:35:03 +0000
@@ -118,6 +118,14 @@
 		env_handle_add(handle, "APP_EXEC_POLICY", "unconfined");
 	}
 
+	if (g_key_file_has_key(keyfile, "Desktop Entry", "X-Ubuntu-XMir-Enable", NULL)) {
+		if (g_key_file_get_boolean(keyfile, "Desktop Entry", "X-Ubuntu-XMir-Enable", NULL)) {
+			env_handle_add(handle, "APP_XMIR_ENABLE", "1");
+		} else {
+			env_handle_add(handle, "APP_XMIR_ENABLE", "0");
+		}
+	}
+
 	/* This string is quoted using desktop file quoting:
 	   http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables */
 	gchar * execline = desktop_to_exec(keyfile, app_id);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-05-13 18:40:49 +0000
+++ tests/CMakeLists.txt	2015-08-17 21:35:03 +0000
@@ -95,3 +95,9 @@
 configure_file ("click-desktop-hook-db/test.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/click-desktop-hook-db/test.conf" @ONLY)
 configure_file ("desktop-hook-test.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/desktop-hook-test.sh" @ONLY)
 add_test (desktop-hook-test desktop-hook-test.sh)
+
+# XMir helper Test
+
+configure_file ("xmir-helper-test.in" "${CMAKE_CURRENT_BINARY_DIR}/xmir-helper-test" @ONLY)
+add_test (xmir-helper-test xmir-helper-test)
+

=== added file 'tests/applications/noxmir.desktop'
--- tests/applications/noxmir.desktop	1970-01-01 00:00:00 +0000
+++ tests/applications/noxmir.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=No XMir Needed
+Type=Application
+Exec=noxmir
+NoDisplay=false
+Hidden=false
+Terminal=false
+X-Ubuntu-XMir-Enable=false

=== added file 'tests/applications/xmir.desktop'
--- tests/applications/xmir.desktop	1970-01-01 00:00:00 +0000
+++ tests/applications/xmir.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=X Application
+Type=Application
+Exec=xfoo
+NoDisplay=false
+Hidden=false
+Terminal=false
+X-Ubuntu-XMir-Enable=true

=== added file 'tests/click-app-dir/.click/info/com.test.mir.manifest'
--- tests/click-app-dir/.click/info/com.test.mir.manifest	1970-01-01 00:00:00 +0000
+++ tests/click-app-dir/.click/info/com.test.mir.manifest	2015-08-17 21:35:03 +0000
@@ -0,0 +1,11 @@
+{
+	"version": "1",
+	"hooks": {
+		"mir": {
+			"desktop": "xmir.desktop"
+		},
+		"nomir": {
+			"desktop": "noxmir.desktop"
+		}
+	}
+}

=== added file 'tests/click-app-dir/noxmir.desktop'
--- tests/click-app-dir/noxmir.desktop	1970-01-01 00:00:00 +0000
+++ tests/click-app-dir/noxmir.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=No XMir Needed
+Type=Application
+Exec=noxmir
+NoDisplay=false
+Hidden=false
+Terminal=false
+X-Ubuntu-XMir-Enable=false

=== added file 'tests/click-app-dir/xmir.desktop'
--- tests/click-app-dir/xmir.desktop	1970-01-01 00:00:00 +0000
+++ tests/click-app-dir/xmir.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=X Application
+Type=Application
+Exec=xfoo
+NoDisplay=false
+Hidden=false
+Terminal=false
+X-Ubuntu-XMir-Enable=true

=== added symlink 'tests/click-root-dir/.click/users/test-user/com.test.mir'
=== target is u'../../../com.test.mir/1/'
=== added directory 'tests/click-root-dir/com.test.mir'
=== added symlink 'tests/click-root-dir/com.test.mir/1'
=== target is u'../../click-app-dir/'
=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2014-08-26 02:21:57 +0000
+++ tests/exec-util-test.cc	2015-08-17 21:35:03 +0000
@@ -17,6 +17,9 @@
  *     Ted Gould <[e-mail]>
  */
 
+#include <map>
+#include <functional>
+
 #include <gtest/gtest.h>
 #include <libdbustest/dbus-test.h>
 #include <gio/gio.h>
@@ -88,186 +91,191 @@
 				cleartry++;
 			}
 		}
+
+		inline void StartCheckEnv (const std::string& appid, std::map<std::string, std::function<void(const gchar *)>> enums) {
+			std::map<std::string, bool> env_found;
+			DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/job", "com.ubuntu.Upstart0_6.Job", nullptr);
+
+			g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
+			g_setenv("TEST_CLICK_USER", "test-user", TRUE);
+			g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", CMAKE_SOURCE_DIR "/link-farm", TRUE);
+
+			ASSERT_TRUE(ubuntu_app_launch_start_application(appid.c_str(), nullptr));
+
+			guint len = 0;
+			const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, nullptr);
+
+			ASSERT_EQ(1, len);
+			ASSERT_NE(nullptr, calls);
+			ASSERT_STREQ("Start", calls[0].name);
+
+			GVariant * envarray = g_variant_get_child_value(calls[0].params, 0);
+			GVariantIter iter;
+			g_variant_iter_init(&iter, envarray);
+			gchar * envvar = NULL;
+
+			while (g_variant_iter_loop(&iter, "s", &envvar)) {
+				g_debug("Looking at variable: %s", envvar);
+				gchar * var = g_strdup(envvar);
+
+				gchar * equal = g_strstr_len(var, -1, "=");
+				ASSERT_NE(equal, nullptr);
+
+				equal[0] = '\0';
+				gchar * value = &(equal[1]);
+
+				/* Test the variable */
+				auto varfunc = enums[var];
+				EXPECT_NE(nullptr, varfunc);
+				if (varfunc)
+					varfunc(value);
+
+				/* Mark it as found */
+				env_found[var] = true;
+
+				g_free(var);
+			}
+
+			g_variant_unref(envarray);
+
+			for(auto enumval : enums) {
+				EXPECT_TRUE(env_found[enumval.first]);
+			}
+		}
 };
 
+static void
+nocheck (const gchar *)
+{
+}
+
 TEST_F(ExecUtil, ClickExec)
 {
-	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/job", "com.ubuntu.Upstart0_6.Job", NULL);
-
-	g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
-	g_setenv("TEST_CLICK_USER", "test-user", TRUE);
-	g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", CMAKE_SOURCE_DIR "/link-farm", TRUE);
-
-	ASSERT_TRUE(ubuntu_app_launch_start_application("com.test.good_application_1.2.3", NULL));
-
-	guint len = 0;
-	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
-
-	ASSERT_EQ(1, len);
-	ASSERT_NE(nullptr, calls);
-	ASSERT_STREQ("Start", calls[0].name);
-
-	unsigned int i;
-
-	bool got_app_isolation = false;
-	bool got_cache_home = false;
-	bool got_config_home = false;
-	bool got_data_home = false;
-	bool got_runtime_dir = false;
-	bool got_data_dirs = false;
-	bool got_temp_dir = false;
-	bool got_shader_dir = false;
-	bool got_app_dir = false;
-	bool got_app_exec = false;
-	bool got_app_id = false;
-	bool got_app_pid = false;
-	bool got_app_desktop_path = false;
-
 #define APP_DIR CMAKE_SOURCE_DIR "/click-root-dir/.click/users/test-user/com.test.good"
 
-	GVariant * envarray = g_variant_get_child_value(calls[0].params, 0);
-	GVariantIter iter;
-	g_variant_iter_init(&iter, envarray);
-	gchar * envvar = NULL;
-
-	while (g_variant_iter_loop(&iter, "s", &envvar)) {
-		gchar * var = g_strdup(envvar);
-
-		gchar * equal = g_strstr_len(var, -1, "=");
-		ASSERT_NE(equal, nullptr);
-
-		equal[0] = '\0';
-		gchar * value = &(equal[1]);
-
-		if (g_strcmp0(var, "UBUNTU_APPLICATION_ISOLATION") == 0) {
-			EXPECT_STREQ("1", value);
-			got_app_isolation = true;
-		} else if (g_strcmp0(var, "XDG_CACHE_HOME") == 0) {
-			got_cache_home = true;
-		} else if (g_strcmp0(var, "XDG_CONFIG_HOME") == 0) {
-			got_config_home = true;
-		} else if (g_strcmp0(var, "XDG_DATA_HOME") == 0) {
-			got_data_home = true;
-		} else if (g_strcmp0(var, "XDG_RUNTIME_DIR") == 0) {
-			got_runtime_dir = true;
-		} else if (g_strcmp0(var, "XDG_DATA_DIRS") == 0) {
-			EXPECT_TRUE(g_str_has_prefix(value, APP_DIR ":"));
-			got_data_dirs = true;
-		} else if (g_strcmp0(var, "TMPDIR") == 0) {
-			EXPECT_TRUE(g_str_has_suffix(value, "com.test.good"));
-			got_temp_dir = true;
-		} else if (g_strcmp0(var, "__GL_SHADER_DISK_CACHE_PATH") == 0) {
-			EXPECT_TRUE(g_str_has_suffix(value, "com.test.good"));
-			got_shader_dir = true;
-		} else if (g_strcmp0(var, "APP_DIR") == 0) {
-			EXPECT_STREQ(APP_DIR, value);
-			got_app_dir = true;
-		} else if (g_strcmp0(var, "APP_EXEC") == 0) {
-			EXPECT_STREQ("foo", value);
-			got_app_exec = true;
-		} else if (g_strcmp0(var, "APP_ID") == 0) {
-			EXPECT_STREQ("com.test.good_application_1.2.3", value);
-			got_app_id = true;
-		} else if (g_strcmp0(var, "APP_LAUNCHER_PID") == 0) {
-			EXPECT_EQ(getpid(), atoi(value));
-			got_app_pid = true;
-		} else if (g_strcmp0(var, "APP_DESKTOP_FILE_PATH") == 0) {
-			EXPECT_STREQ(APP_DIR "/application.desktop", value);
-			got_app_desktop_path = true;
-		} else {
-			g_warning("Unknown variable! %s", var);
-			EXPECT_TRUE(false);
-		}
-
-		g_free(var);
-	}
-
-	g_variant_unref(envarray);
+	StartCheckEnv("com.test.good_application_1.2.3", {
+		{"UBUNTU_APPLICATION_ISOLATION", [](const gchar * value) {
+			EXPECT_STREQ("1", value); }},
+		{"XDG_CACHE_HOME", nocheck},
+		{"XDG_CONFIG_HOME", nocheck},
+		{"XDG_DATA_HOME", nocheck},
+		{"XDG_RUNTIME_DIR", nocheck},
+		{"XDG_DATA_DIRS", [](const gchar * value) {
+			EXPECT_TRUE(g_str_has_prefix(value, APP_DIR ":")); }},
+		{"TMPDIR", [](const gchar * value) {
+			EXPECT_TRUE(g_str_has_suffix(value, "com.test.good")); }},
+		{"__GL_SHADER_DISK_CACHE_PATH", [](const gchar * value) {
+			EXPECT_TRUE(g_str_has_suffix(value, "com.test.good")); }},
+		{"APP_DIR", [](const gchar * value) {
+			EXPECT_STREQ(APP_DIR, value); }},
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("foo", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("com.test.good_application_1.2.3", value); }},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
+			EXPECT_STREQ(APP_DIR "/application.desktop", value); }},
+	});
 
 #undef APP_DIR
-
-	EXPECT_TRUE(got_app_isolation);
-	EXPECT_TRUE(got_cache_home);
-	EXPECT_TRUE(got_config_home);
-	EXPECT_TRUE(got_data_home);
-	EXPECT_TRUE(got_runtime_dir);
-	EXPECT_TRUE(got_data_dirs);
-	EXPECT_TRUE(got_temp_dir);
-	EXPECT_TRUE(got_shader_dir);
-	EXPECT_TRUE(got_app_dir);
-	EXPECT_TRUE(got_app_exec);
-	EXPECT_TRUE(got_app_id);
-	EXPECT_TRUE(got_app_pid);
-	EXPECT_TRUE(got_app_desktop_path);
 }
 
 TEST_F(ExecUtil, DesktopExec)
 {
-	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/com/test/job", "com.ubuntu.Upstart0_6.Job", NULL);
-
-	ASSERT_TRUE(ubuntu_app_launch_start_application("foo", NULL));
-
-	guint len = 0;
-	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
-
-	ASSERT_EQ(1, len);
-	ASSERT_NE(nullptr, calls);
-	ASSERT_STREQ("Start", calls[0].name);
-
-	unsigned int i;
-
-	bool got_app_exec = false;
-	bool got_app_desktop_path = false;
-	bool got_app_exec_policy = false;
-	bool got_app_id = false;
-	bool got_app_pid = false;
-	bool got_instance_id = false;
-
-	GVariant * envarray = g_variant_get_child_value(calls[0].params, 0);
-	GVariantIter iter;
-	g_variant_iter_init(&iter, envarray);
-	gchar * envvar = NULL;
-
-	while (g_variant_iter_loop(&iter, "s", &envvar)) {
-		gchar * var = g_strdup(envvar);
-
-		gchar * equal = g_strstr_len(var, -1, "=");
-		ASSERT_NE(equal, nullptr);
-
-		equal[0] = '\0';
-		gchar * value = &(equal[1]);
-
-		if (g_strcmp0(var, "APP_EXEC") == 0) {
-			EXPECT_STREQ("foo", value);
-			got_app_exec = true;
-		} else if (g_strcmp0(var, "APP_DESKTOP_FILE_PATH") == 0) {
-			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value);
-			got_app_desktop_path = true;
-		} else if (g_strcmp0(var, "APP_EXEC_POLICY") == 0) {
-			EXPECT_STREQ("unconfined", value);
-			got_app_exec_policy = true;
-		} else if (g_strcmp0(var, "APP_ID") == 0) {
-			EXPECT_STREQ("foo", value);
-			got_app_id = true;
-		} else if (g_strcmp0(var, "APP_LAUNCHER_PID") == 0) {
-			EXPECT_EQ(getpid(), atoi(value));
-			got_app_pid = true;
-		} else if (g_strcmp0(var, "INSTANCE_ID") == 0) {
-			got_instance_id = true;
-		} else {
-			g_warning("Unknown variable! %s", var);
-			EXPECT_TRUE(false);
-		}
-
-		g_free(var);
-	}
-
-	g_variant_unref(envarray);
-
-	EXPECT_TRUE(got_app_exec);
-	EXPECT_TRUE(got_app_desktop_path);
-	EXPECT_TRUE(got_app_exec_policy);
-	EXPECT_TRUE(got_app_id);
-	EXPECT_TRUE(got_app_pid);
-	EXPECT_TRUE(got_instance_id);
+	StartCheckEnv("foo", {
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("foo", value); }},
+		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
+			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }},
+		{"APP_EXEC_POLICY", [](const gchar * value) {
+			EXPECT_STREQ("unconfined", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("foo", value); }},
+		{"INSTANCE_ID", nocheck},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+	});
+}
+
+TEST_F(ExecUtil, DesktopMir)
+{
+	StartCheckEnv("xmir", {
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("xfoo", value); }},
+		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
+			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/xmir.desktop", value); }},
+		{"APP_EXEC_POLICY", [](const gchar * value) {
+			EXPECT_STREQ("unconfined", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("xmir", value); }},
+		{"INSTANCE_ID", nocheck},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("1", value); }},
+	});
+}
+
+TEST_F(ExecUtil, DesktopNoMir)
+{
+	StartCheckEnv("noxmir", {
+		{"APP_EXEC", [](const gchar * value) {
+			EXPECT_STREQ("noxmir", value); }},
+		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
+			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/noxmir.desktop", value); }},
+		{"APP_EXEC_POLICY", [](const gchar * value) {
+			EXPECT_STREQ("unconfined", value); }},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("noxmir", value); }},
+		{"INSTANCE_ID", nocheck},
+		{"APP_LAUNCHER_PID", [](const gchar * value) {
+			EXPECT_EQ(getpid(), atoi(value)); }},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("0", value); }},
+	});
+}
+
+TEST_F(ExecUtil, ClickMir)
+{
+	StartCheckEnv("com.test.mir_mir_1", {
+		{"UBUNTU_APPLICATION_ISOLATION", nocheck},
+		{"XDG_CACHE_HOME", nocheck},
+		{"XDG_CONFIG_HOME", nocheck},
+		{"XDG_DATA_HOME", nocheck},
+		{"XDG_RUNTIME_DIR", nocheck},
+		{"XDG_DATA_DIRS", nocheck},
+		{"TMPDIR", nocheck},
+		{"__GL_SHADER_DISK_CACHE_PATH", nocheck},
+		{"APP_DIR", nocheck},
+		{"APP_EXEC", nocheck},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("com.test.mir_mir_1", value); }},
+		{"APP_LAUNCHER_PID", nocheck},
+		{"APP_DESKTOP_FILE_PATH", nocheck},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("1", value); }},
+	});
+}
+
+TEST_F(ExecUtil, ClickNoMir)
+{
+	StartCheckEnv("com.test.mir_nomir_1", {
+		{"UBUNTU_APPLICATION_ISOLATION", nocheck},
+		{"XDG_CACHE_HOME", nocheck},
+		{"XDG_CONFIG_HOME", nocheck},
+		{"XDG_DATA_HOME", nocheck},
+		{"XDG_RUNTIME_DIR", nocheck},
+		{"XDG_DATA_DIRS", nocheck},
+		{"TMPDIR", nocheck},
+		{"__GL_SHADER_DISK_CACHE_PATH", nocheck},
+		{"APP_DIR", nocheck},
+		{"APP_EXEC", nocheck},
+		{"APP_ID", [](const gchar * value) {
+			EXPECT_STREQ("com.test.mir_nomir_1", value); }},
+		{"APP_LAUNCHER_PID", nocheck},
+		{"APP_DESKTOP_FILE_PATH", nocheck},
+		{"APP_XMIR_ENABLE", [](const gchar * value) {
+			EXPECT_STREQ("0", value); }},
+	});
 }

=== added file 'tests/link-farm/com.test.mir_mir_1.desktop'
--- tests/link-farm/com.test.mir_mir_1.desktop	1970-01-01 00:00:00 +0000
+++ tests/link-farm/com.test.mir_mir_1.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,1 @@
+Needs to exist

=== added file 'tests/link-farm/com.test.mir_nomir_1.desktop'
--- tests/link-farm/com.test.mir_nomir_1.desktop	1970-01-01 00:00:00 +0000
+++ tests/link-farm/com.test.mir_nomir_1.desktop	2015-08-17 21:35:03 +0000
@@ -0,0 +1,1 @@
+Needs to exist

=== added file 'tests/xmir-helper-exec.sh'
--- tests/xmir-helper-exec.sh	1970-01-01 00:00:00 +0000
+++ tests/xmir-helper-exec.sh	2015-08-17 21:35:03 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $DISPLAY

=== added file 'tests/xmir-helper-test.in'
--- tests/xmir-helper-test.in	1970-01-01 00:00:00 +0000
+++ tests/xmir-helper-test.in	2015-08-17 21:35:03 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo -n "Testing XMir Helper… "
+
+export UBUNTU_APP_LAUNCH_XMIR_PATH="@CMAKE_CURRENT_SOURCE_DIR@/xmir-mock.sh"
+
+TESTVALUE=`@CMAKE_BINARY_DIR@/xmir-helper com.mir.test_mirtest_1.2.3 @CMAKE_CURRENT_SOURCE_DIR@/xmir-helper-exec.sh`
+
+if [ $TESTVALUE == ":42" ]; then
+	echo "PASSED"
+else
+	echo "FAILED"
+	exit 1
+fi
+
+echo -n "Testing an evil XMir helper… "
+
+export UBUNTU_APP_LAUNCH_XMIR_PATH="@CMAKE_CURRENT_SOURCE_DIR@/xmir-mock-evil.sh"
+
+if @CMAKE_BINARY_DIR@/xmir-helper com.mir.test_mirtest_1.2.3 @CMAKE_CURRENT_SOURCE_DIR@/xmir-helper-exec.sh  ; then
+	echo "FAILED"
+	exit 1
+else
+	echo "PASSED"
+fi

=== added file 'tests/xmir-mock.sh'
--- tests/xmir-mock.sh	1970-01-01 00:00:00 +0000
+++ tests/xmir-mock.sh	2015-08-17 21:35:03 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ $1 != "-displayfd" ]; then
+	echo "-displayfd missing"
+	exit 1
+fi
+
+if [ $3 != "-mir" ]; then
+	echo "-mir missing"
+	exit 1
+fi
+
+if [ $4 != "com.mir.test_mirtest_1.2.3" ]; then
+	echo "AppID wrong"
+	exit 1
+fi
+
+echo "42" >&$2
+
+# Ensure that our "XMir" runs longer than
+# the test, if it exits first that's a failure
+sleep 1

=== modified file 'upstart-jobs/application-click.conf.in'
--- upstart-jobs/application-click.conf.in	2015-01-23 18:12:29 +0000
+++ upstart-jobs/application-click.conf.in	2015-08-17 21:35:03 +0000
@@ -11,6 +11,7 @@
 env APP_URIS
 env APP_DIR
 env APP_DESKTOP_FILE_PATH
+env APP_XMIR_ENABLE
 
 env UBUNTU_APP_LAUNCH_ARCH="@ubuntu_app_launch_arch@"
 export UBUNTU_APP_LAUNCH_ARCH

=== modified file 'upstart-jobs/application-legacy.conf.in'
--- upstart-jobs/application-legacy.conf.in	2015-01-23 18:12:29 +0000
+++ upstart-jobs/application-legacy.conf.in	2015-08-17 21:35:03 +0000
@@ -11,6 +11,7 @@
 env APP_EXEC_POLICY=""
 env APP_URIS
 env APP_DESKTOP_FILE_PATH
+env APP_XMIR_ENABLE
 
 # This will be set to "unconfined" by desktop-exec if there is no confinement defined
 apparmor switch $APP_EXEC_POLICY

=== added file 'xmir-helper.c'
--- xmir-helper.c	1970-01-01 00:00:00 +0000
+++ xmir-helper.c	2015-08-17 21:35:03 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#define _POSIX_C_SOURCE 200212L
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <signal.h>
+
+void
+sigchild_handler (int signal)
+{
+	fprintf(stderr, "XMir has closed unexpectedly\n");
+	exit(1);
+}
+
+struct sigaction sigchild_action = {
+	.sa_handler = sigchild_handler,
+	.sa_flags = SA_NOCLDWAIT
+};
+
+int
+main (int argc, char * argv[])
+{
+	if (argc < 3) {
+		fprintf(stderr, "xmir-helper needs more arguments: xmir-helper $(appid) $(thing to exec) ... \n");
+		return 1;
+	}
+
+	/* Make nice variables for the things we need */
+	char * appid = argv[1];
+	char * xmir = getenv("UBUNTU_APP_LAUNCH_XMIR_PATH");
+	if (xmir == NULL) {
+		xmir = "/usr/bin/Xmir";
+	}
+
+	/* Build a socket pair to get the connection back from XMir */
+	int sockets[2];
+	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sockets) != 0) {
+		fprintf(stderr, "Unable to create socketpair for communicating with XMir\n");
+		return 1;
+	}
+
+	/* Give them nice names, the compiler will optimize out */
+	int xmirsocket = sockets[0];
+	int helpersocket = sockets[1];
+
+	/* Watch for the child dying */
+	if (sigaction(SIGCHLD, &sigchild_action, NULL) != 0) {
+		fprintf(stderr, "Unable to setup child signal handler\n");
+		return 1;
+	}
+
+	/* Start XMir */
+	if (fork() == 0) {
+		/* XMir start here */
+		/* GOAL: XMir -displayfd ${xmirsocket} -mir ${appid} */
+		char socketbuf[16] = {0};
+		snprintf(socketbuf, 16, "%d", xmirsocket);
+
+		char * xmirexec[6] = {
+			xmir,
+			"-displayfd",
+			socketbuf,
+			"-mir",
+			appid,
+			NULL
+		};
+
+		return execv(xmir, xmirexec);
+	}
+
+	/* Wait to get the display number from XMir */
+	char readbuf[16] = {0};
+	if (read(helpersocket, readbuf, 16) == 0) {
+		fprintf(stderr, "Not reading anything from XMir\n");
+		return 1;
+	}
+
+	int i;
+	for (i = 0; i < sizeof(readbuf); i++) {
+		if (readbuf[i] == '\n') {
+			readbuf[i] = '\0';
+			break;
+		}
+	}
+
+	char displaynumber[16] = {0};
+	snprintf(displaynumber, 16, ":%s", readbuf);
+
+	/* Set up the display variable */
+	setenv("DISPLAY", displaynumber, 1);
+
+	/* Now that we have everything setup, we can execute */
+	char ** nargv = &argv[2];
+	int execret = execvp(nargv[0], nargv);
+	return execret;
+}