diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2011-04-13 11:32:32 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2011-04-13 11:32:32 +0200 |
| commit | 8a9d9a47bd9f320f6571861540b5b15efe6a4ef8 (patch) | |
| tree | 4d5123ca072e969df1d44030359b95179eebf25a | |
| parent | 0716e21a33697f18b35ec5d780255713e0667bff (diff) | |
selftest: Globally set configuration path
Set $UPOWER_CONF_FILE_NAME before calling the tests, so that other tests can
also initialize the daemon.
| -rw-r--r-- | src/up-self-test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/up-self-test.c b/src/up-self-test.c index 4e0095d..fd69a51 100644 --- a/src/up-self-test.c +++ b/src/up-self-test.c @@ -64,12 +64,6 @@ up_test_daemon_func (void) { UpDaemon *daemon; - /* make check, vs. make distcheck */ - if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS)) - g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE); - else - g_setenv ("UPOWER_CONF_FILE_NAME", "../../etc/UPower.conf", TRUE); - daemon = up_daemon_new (); g_assert (daemon != NULL); @@ -285,6 +279,12 @@ main (int argc, char **argv) g_type_init (); g_test_init (&argc, &argv, NULL); + /* make check, vs. make distcheck */ + if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS)) + g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE); + else + g_setenv ("UPOWER_CONF_FILE_NAME", "../../etc/UPower.conf", TRUE); + /* tests go here */ g_test_add_func ("/power/backend", up_test_backend_func); g_test_add_func ("/power/device", up_test_device_func); |