From ed4ac965fac18bfb4f030ea82159384c3403ab05 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Oct 2018 15:45:05 +0200 Subject: [PATCH] manager: rework test flags set No reason to avoid bit 0. Also, fix some tests that pass "true" as flags value, which is just wrong. --- src/core/manager.h | 8 ++++---- src/test/test-bpf.c | 2 +- src/test/test-watch-pid.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/manager.h b/src/core/manager.h index a26ffda3a5..13110b3b63 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -110,10 +110,10 @@ typedef enum ManagerTimestamp { enum { /* 0 = run normally */ - MANAGER_TEST_RUN_MINIMAL = 1 << 1, /* create basic data structures */ - MANAGER_TEST_RUN_BASIC = 1 << 2, /* interact with the environment */ - MANAGER_TEST_RUN_ENV_GENERATORS = 1 << 3, /* also run env generators */ - MANAGER_TEST_RUN_GENERATORS = 1 << 4, /* also run unit generators */ + MANAGER_TEST_RUN_MINIMAL = 1 << 0, /* create basic data structures */ + MANAGER_TEST_RUN_BASIC = 1 << 1, /* interact with the environment */ + MANAGER_TEST_RUN_ENV_GENERATORS = 1 << 2, /* also run env generators */ + MANAGER_TEST_RUN_GENERATORS = 1 << 3, /* also run unit generators */ MANAGER_TEST_FULL = MANAGER_TEST_RUN_BASIC | MANAGER_TEST_RUN_ENV_GENERATORS | MANAGER_TEST_RUN_GENERATORS, }; assert_cc((MANAGER_TEST_FULL & UINT8_MAX) == MANAGER_TEST_FULL); diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c index 2fb7968dfd..ea5f0f5bc6 100644 --- a/src/test/test-bpf.c +++ b/src/test/test-bpf.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { /* The simple tests suceeded. Now let's try full unit-based use-case. */ - assert_se(manager_new(UNIT_FILE_USER, true, &m) >= 0); + assert_se(manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_BASIC, &m) >= 0); assert_se(manager_startup(m, NULL, NULL) >= 0); assert_se(u = unit_new(m, sizeof(Service))); diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c index 03378ecf08..2c6ca0a1a2 100644 --- a/src/test/test-watch-pid.c +++ b/src/test/test-watch-pid.c @@ -24,7 +24,7 @@ int main(int argc, char *argv[]) { assert_se(set_unit_path(get_testdata_dir()) >= 0); assert_se(runtime_dir = setup_fake_runtime_dir()); - assert_se(manager_new(UNIT_FILE_USER, true, &m) >= 0); + assert_se(manager_new(UNIT_FILE_USER, MANAGER_TEST_RUN_BASIC, &m) >= 0); assert_se(manager_startup(m, NULL, NULL) >= 0); assert_se(a = unit_new(m, sizeof(Service))); -- 2.25.1