diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2011-07-15 10:16:13 +1000 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2011-07-15 10:16:13 +1000 |
| commit | bb774efe7f674c8740781724280cb802c53d40a5 (patch) | |
| tree | dc90493f19b3e6511952a8fe1e2836759be1d431 /tests | |
| parent | 747b5449507fa3e246367801814ebce11b1b3116 (diff) | |
| download | lightdm-bb774efe7f674c8740781724280cb802c53d40a5.tar.gz | |
Reworked X authority code
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/test-gobject-greeter.c | 4 | ||||
| -rw-r--r-- | tests/src/test-runner.c | 2 | ||||
| -rw-r--r-- | tests/src/test-session.c | 4 | ||||
| -rw-r--r-- | tests/src/test-xserver.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index e0e4d02c..55ec03f7 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -144,8 +144,8 @@ main (int argc, char **argv) notify_status ("GREETER START"); config = g_key_file_new (); - if (g_getenv ("TEST_CONFIG")) - g_key_file_load_from_file (config, g_getenv ("TEST_CONFIG"), G_KEY_FILE_NONE, NULL); + if (g_getenv ("LIGHTDM_TEST_CONFIG")) + g_key_file_load_from_file (config, g_getenv ("LIGHTDM_TEST_CONFIG"), G_KEY_FILE_NONE, NULL); g_type_init (); diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index f04a5781..d2f1400b 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -487,7 +487,7 @@ main (int argc, char **argv) /* Set config for child processes to read */ if (config_path) - g_setenv ("TEST_CONFIG", config_path, TRUE); + g_setenv ("LIGHTDM_TEST_CONFIG", config_path, TRUE); /* Run local D-Bus daemon */ if (pipe (dbus_pipe) < 0) diff --git a/tests/src/test-session.c b/tests/src/test-session.c index 13a006a3..86fd7fcd 100644 --- a/tests/src/test-session.c +++ b/tests/src/test-session.c @@ -30,8 +30,8 @@ main (int argc, char **argv) notify_status ("SESSION START USER=%s", getenv ("USER")); config = g_key_file_new (); - if (g_getenv ("TEST_CONFIG")) - g_key_file_load_from_file (config, g_getenv ("TEST_CONFIG"), G_KEY_FILE_NONE, NULL); + if (g_getenv ("LIGHTDM_TEST_CONFIG")) + g_key_file_load_from_file (config, g_getenv ("LIGHTDM_TEST_CONFIG"), G_KEY_FILE_NONE, NULL); loop = g_main_loop_new (NULL, FALSE); diff --git a/tests/src/test-xserver.c b/tests/src/test-xserver.c index c351ee4b..48603895 100644 --- a/tests/src/test-xserver.c +++ b/tests/src/test-xserver.c @@ -908,8 +908,8 @@ main (int argc, char **argv) notify_status ("XSERVER :%d START", display_number); config = g_key_file_new (); - if (g_getenv ("TEST_CONFIG")) - g_key_file_load_from_file (config, g_getenv ("TEST_CONFIG"), G_KEY_FILE_NONE, NULL); + if (g_getenv ("LIGHTDM_TEST_CONFIG")) + g_key_file_load_from_file (config, g_getenv ("LIGHTDM_TEST_CONFIG"), G_KEY_FILE_NONE, NULL); if (g_key_file_has_key (config, "test-xserver-config", "return-value", NULL)) { |