diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-02-24 15:31:33 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-12 13:43:29 +0200 |
commit | a3c4eb07106b29f7366113764cb1c8c4d6dd5646 (patch) | |
tree | 61045467e8575207dbe409d642f5ea9a1a3728d9 /src/test/test-path-lookup.c | |
parent | 4447e799be18b255b11844c64b834714f4da54f8 (diff) |
core: rework generator dir logic, move the dirs into LookupPaths structure
A long time ago – when generators where first introduced – the directories for
them were randomly created via mkdtemp(). This was changed later so that they
use fixed name directories now. Let's make use of this, and add the genrator
dirs to the LookupPaths structure and into the unit file search path maintained
in it. This has the benefit that the generator dirs are now normal part of the
search path for all tools, and thus are shown in "systemctl list-unit-files"
too.
Diffstat (limited to 'src/test/test-path-lookup.c')
-rw-r--r-- | src/test/test-path-lookup.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index 268da002a9..ebb11dcb6d 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -31,25 +31,20 @@ static void test_paths(ManagerRunningAs running_as, bool personal) { _cleanup_lookup_paths_free_ LookupPaths lp_without_env = {}; _cleanup_lookup_paths_free_ LookupPaths lp_with_env = {}; - char *exists, *not, *systemd_unit_path; + char *systemd_unit_path; assert_se(mkdtemp(template)); - exists = strjoina(template, "/exists"); - assert_se(mkdir(exists, 0755) == 0); - not = strjoina(template, "/not"); assert_se(unsetenv("SYSTEMD_UNIT_PATH") == 0); - assert_se(lookup_paths_init(&lp_without_env, running_as, personal, NULL, exists, not, not) == 0); + assert_se(lookup_paths_init(&lp_without_env, running_as, personal, NULL) == 0); - assert_se(!strv_isempty(lp_without_env.unit_path)); - assert_se(strv_contains(lp_without_env.unit_path, exists)); - assert_se(strv_contains(lp_without_env.unit_path, not)); + assert_se(!strv_isempty(lp_without_env.search_path)); systemd_unit_path = strjoina(template, "/systemd-unit-path"); assert_se(setenv("SYSTEMD_UNIT_PATH", systemd_unit_path, 1) == 0); - assert_se(lookup_paths_init(&lp_with_env, running_as, personal, NULL, exists, not, not) == 0); - assert_se(strv_length(lp_with_env.unit_path) == 1); - assert_se(streq(lp_with_env.unit_path[0], systemd_unit_path)); + assert_se(lookup_paths_init(&lp_with_env, running_as, personal, NULL) == 0); + assert_se(strv_length(lp_with_env.search_path) == 1); + assert_se(streq(lp_with_env.search_path[0], systemd_unit_path)); assert_se(rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0); } |