summaryrefslogtreecommitdiff
path: root/src/test/test-execute.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-03-29 15:55:59 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-03-29 16:17:57 +0200
commitb380b6438361e39ad5076bfa58d2021621a957af (patch)
tree41ef3c9738a5989af15ce0a3626a966716ef9d1f /src/test/test-execute.c
parent5c29de29b43829ba09967b05ae2f136356c8c0d2 (diff)
downloadsystemd-b380b6438361e39ad5076bfa58d2021621a957af.tar.gz
Rename UnitFileScope to LookupScope
As suggested in https://github.com/systemd/systemd/pull/22649/commits/8b3ad3983f5440eef812b34e5ed862ca59fdf7f7#r837345892 The define is generalized and moved to path-lookup.h, where it seems to fit better. This allows a recursive include to be removed and in general makes things simpler.
Diffstat (limited to 'src/test/test-execute.c')
-rw-r--r--src/test/test-execute.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index ba1be2b453..6fce05bb58 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1117,7 +1117,7 @@ typedef struct test_entry {
#define entry(x) {x, #x}
-static int run_tests(UnitFileScope scope, const test_entry tests[], char **patterns) {
+static int run_tests(LookupScope scope, const test_entry tests[], char **patterns) {
_cleanup_(manager_freep) Manager *m = NULL;
int r;
@@ -1239,11 +1239,11 @@ int main(int argc, char *argv[]) {
assert_se(unsetenv("VAR2") == 0);
assert_se(unsetenv("VAR3") == 0);
- r = run_tests(UNIT_FILE_USER, user_tests, argv + 1);
+ r = run_tests(LOOKUP_SCOPE_USER, user_tests, argv + 1);
if (r != 0)
return r;
- r = run_tests(UNIT_FILE_SYSTEM, system_tests, argv + 1);
+ r = run_tests(LOOKUP_SCOPE_SYSTEM, system_tests, argv + 1);
if (r != 0)
return r;
@@ -1265,11 +1265,11 @@ int main(int argc, char *argv[]) {
can_unshare = false;
- r = run_tests(UNIT_FILE_USER, user_tests, argv + 1);
+ r = run_tests(LOOKUP_SCOPE_USER, user_tests, argv + 1);
if (r != 0)
return r;
- return run_tests(UNIT_FILE_SYSTEM, system_tests, argv + 1);
+ return run_tests(LOOKUP_SCOPE_SYSTEM, system_tests, argv + 1);
#else
return 0;
#endif