diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-03-10 09:47:10 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-03-10 09:47:39 +0100 |
commit | 4870133bfaaf97189a970a29bf47e0e38fa721aa (patch) | |
tree | d2fa9a5699a8b4c948179afabf3da2f9da322ce5 /src/test/test-execute.c | |
parent | 5f64d2bf332371bdfdcb91b588e57d4c0c20428f (diff) | |
download | systemd-4870133bfaaf97189a970a29bf47e0e38fa721aa.tar.gz |
basic: add RuntimeScope enum
In various tools and services we have a per-system and per-user concept.
So far we sometimes used a boolean indicating whether we are in system
mode, or a reversed boolean indicating whether we are in user mode, or
the LookupScope enum used by the lookup path logic.
Let's address that, in introduce a common enum for this, we can use all
across the board.
This is mostly just search/replace, no actual code changes.
Diffstat (limited to 'src/test/test-execute.c')
-rw-r--r-- | src/test/test-execute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 7df3be4a7c..a91cbb2c67 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -1141,7 +1141,7 @@ typedef struct test_entry { #define entry(x) {x, #x} -static void run_tests(LookupScope scope, char **patterns) { +static void run_tests(RuntimeScope scope, char **patterns) { _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; _cleanup_free_ char *unit_paths = NULL; _cleanup_(manager_freep) Manager *m = NULL; @@ -1297,7 +1297,7 @@ TEST(run_tests_root) { if (prepare_ns("(test-execute-root)") == 0) { can_unshare = true; - run_tests(LOOKUP_SCOPE_SYSTEM, filters); + run_tests(RUNTIME_SCOPE_SYSTEM, filters); _exit(EXIT_SUCCESS); } } @@ -1306,7 +1306,7 @@ TEST(run_tests_without_unshare) { if (!have_namespaces()) { /* unshare() is already filtered. */ can_unshare = false; - run_tests(LOOKUP_SCOPE_SYSTEM, strv_skip(saved_argv, 1)); + run_tests(RUNTIME_SCOPE_SYSTEM, strv_skip(saved_argv, 1)); return; } @@ -1334,7 +1334,7 @@ TEST(run_tests_without_unshare) { assert_se(errno == EOPNOTSUPP); can_unshare = false; - run_tests(LOOKUP_SCOPE_SYSTEM, filters); + run_tests(RUNTIME_SCOPE_SYSTEM, filters); _exit(EXIT_SUCCESS); } #else @@ -1355,7 +1355,7 @@ TEST(run_tests_unprivileged) { assert_se(capability_bounding_set_drop(0, /* right_now = */ true) >= 0); can_unshare = false; - run_tests(LOOKUP_SCOPE_USER, filters); + run_tests(RUNTIME_SCOPE_USER, filters); _exit(EXIT_SUCCESS); } } |