diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-03-27 13:48:48 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-03-27 13:48:48 +1300 |
| commit | 0b866116003167563008c6ed3dcdb8fa557c39c8 (patch) | |
| tree | 6cf8874be66d85d814786a67e16f43d974b04660 | |
| parent | 763ae922fd6cf05e13f9f1332ec9d77232d6f187 (diff) | |
| download | lightdm-git-0b866116003167563008c6ed3dcdb8fa557c39c8.tar.gz | |
Only report test command line if it fails
| -rw-r--r-- | tests/src/test-runner.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index af241795..3f58b4cf 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -17,6 +17,7 @@ /* Timeout in ms to wait for SIGTERM to be handled by a child process */ #define KILL_TIMEOUT 2000 +static gchar *test_runner_command; static gchar *config_path; static GKeyFile *config; static GSocket *status_socket = NULL; @@ -238,7 +239,8 @@ fail (const gchar *event, const gchar *expected) if (stop) return; - g_printerr ("Test failed, got the following events:\n"); + g_printerr ("Command line: %s", test_runner_command); + g_printerr ("Events:\n"); for (link = statuses; link; link = link->next) g_printerr (" %s\n", (gchar *)link->data); if (event) @@ -1141,9 +1143,9 @@ run_lightdm () g_string_append_printf (command_line, " --remote-sessions-dir=%s/usr/share/remote-sessions", temp_dir); g_string_append_printf (command_line, " --xgreeters-dir=%s/usr/share/xgreeters", temp_dir); - g_print ("Start daemon with command: PATH=%s LD_PRELOAD=%s LD_LIBRARY_PATH=%s LIGHTDM_TEST_ROOT=%s DBUS_SESSION_BUS_ADDRESS=%s %s\n", - g_getenv ("PATH"), g_getenv ("LD_PRELOAD"), g_getenv ("LD_LIBRARY_PATH"), g_getenv ("LIGHTDM_TEST_ROOT"), g_getenv ("DBUS_SESSION_BUS_ADDRESS"), - command_line->str); + test_runner_command = g_strdup_printf ("PATH=%s LD_PRELOAD=%s LD_LIBRARY_PATH=%s LIGHTDM_TEST_ROOT=%s DBUS_SESSION_BUS_ADDRESS=%s %s\n", + g_getenv ("PATH"), g_getenv ("LD_PRELOAD"), g_getenv ("LD_LIBRARY_PATH"), g_getenv ("LIGHTDM_TEST_ROOT"), g_getenv ("DBUS_SESSION_BUS_ADDRESS"), + command_line->str); if (!g_shell_parse_argv (command_line->str, NULL, &lightdm_argv, &error)) { @@ -1207,9 +1209,6 @@ main (int argc, char **argv) load_script (config_path); - g_print ("----------------------------------------\n"); - g_print ("Running script %s\n", script_name); - if (!getcwd (cwd, 1024)) { g_critical ("Error getting current directory: %s", strerror (errno)); |