Merge lp:~dobey/ubuntu-app-launch/test-exit-code into lp:ubuntu-app-launch/15.04

[dobey]

Save status from waitpid and exit with it.

[Charles Kerr (charlesk)]

LGTM.

review: Approve

[lp:~dobey/ubuntu-app-launch/test-exit-code]

190. By dobey on 2015-03-13

Save status from waitpid and exit with it.

[Alejandro J. Cura (alecu)]

Looks better.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/319/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-vivid-amd64-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-vivid-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-vivid-i386-ci/14

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

review: Needs Fixing (continuous-integration)

=== modified file 'ubuntu-app-test/src/ubuntu-app-test.c'
--- ubuntu-app-test/src/ubuntu-app-test.c	2015-02-23 17:54:59 +0000
+++ ubuntu-app-test/src/ubuntu-app-test.c	2015-03-13 16:03:59 +0000
@@ -107,13 +107,14 @@
 	g_free(sock);
 
 	pid_t subpid = 0;
+	int exit_status = -1;
 	if ((subpid = fork()) == 0) {
 		return execvp(argv[1], argv + 1);
 	}
-	waitpid(subpid, NULL, 0);
+	waitpid(subpid, &exit_status, 0);
 
 	mir_prompt_session_release_sync(session);
 	mir_connection_release(mir);
 
-	return 0;
+	return WEXITSTATUS(exit_status);
 }