diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2019-02-17 14:29:43 +0000 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2019-02-17 14:29:43 +0000 |
commit | 449937fc864c56fd696c66641effee7cdc7ec035 (patch) | |
tree | 159b588611e18ca68a2e8ee5bb3b9ea3995c68a0 | |
parent | 0477d037a368a9d77f63d1d6999fa89d230c8f7e (diff) | |
parent | b9c2b6827981dd32041f59d89f74c7f4537697f0 (diff) | |
download | tracker-449937fc864c56fd696c66641effee7cdc7ec035.tar.gz |
Merge branch 'libtracker-common-test-paths' into 'master'
libtracker-common: improve test_path_evaluate_name environment handling
See merge request GNOME/tracker!59
-rw-r--r-- | tests/libtracker-common/tracker-file-utils-test.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c index 93a409b37..5bf1c9ed4 100644 --- a/tests/libtracker-common/tracker-file-utils-test.c +++ b/tests/libtracker-common/tracker-file-utils-test.c @@ -131,14 +131,14 @@ test_path_list_filter_duplicates_with_exceptions () static void test_path_evaluate_name (void) { - gchar *result, *expected; + gchar *result, *expected, *pwd, *home; - const gchar *home = g_getenv ("HOME"); - const gchar *pwd = g_getenv ("PWD"); const gchar *test = "/one/two"; gchar *parent_dir; + home = g_strdup (g_getenv ("HOME")); + pwd = g_get_current_dir (); g_setenv ("TEST_TRACKER_DIR", test, TRUE); @@ -216,6 +216,8 @@ test_path_evaluate_name (void) result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); + g_free (home); + g_free (pwd); g_unsetenv ("TEST_TRACKER_DIR"); } |