diff options
| -rw-r--r-- | src/basic/build.h | 4 | ||||
| -rw-r--r-- | src/id128/id128.c | 1 | ||||
| -rw-r--r-- | src/journal/test-journal-flush.c | 7 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/test-event.c | 4 | ||||
| -rw-r--r-- | src/test/test-cgroup-util.c | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/src/basic/build.h b/src/basic/build.h index 7a59059080..c47e912eb0 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -129,7 +129,7 @@ #define _PCRE2_FEATURE_ "-PCRE2" #endif -#define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME +#define _CGROUP_HIERARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME #define SYSTEMD_FEATURES \ _PAM_FEATURE_ " " \ @@ -153,4 +153,4 @@ _IDN2_FEATURE_ " " \ _IDN_FEATURE_ " " \ _PCRE2_FEATURE_ " " \ - _CGROUP_HIEARCHY_ + _CGROUP_HIERARCHY_ diff --git a/src/id128/id128.c b/src/id128/id128.c index 4b370d700d..d3874dbb00 100644 --- a/src/id128/id128.c +++ b/src/id128/id128.c @@ -101,6 +101,7 @@ static int parse_argv(int argc, char *argv[]) { static const struct option options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, ARG_VERSION }, + { "pretty", no_argument, NULL, 'p' }, { "app-specific", required_argument, NULL, 'a' }, {}, }; diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index 50500222ad..5fedd3ed20 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -42,13 +42,16 @@ int main(int argc, char *argv[]) { assert_se(f && f->current_offset > 0); r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o); + if (r < 0) + log_error_errno(r, "journal_file_move_to_object failed: %m"); assert_se(r >= 0); r = journal_file_copy_entry(f, new_journal, o, f->current_offset); + if (r < 0) + log_error_errno(r, "journal_file_copy_entry failed: %m"); assert_se(r >= 0); - n++; - if (n > 10000) + if (++n >= 10000) break; } diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index 224ea93a77..954b93ada0 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -395,7 +395,7 @@ static int inotify_handler(sd_event_source *s, const struct inotify_event *ev, v } else if (ev->mask & IN_CREATE) { unsigned i; - log_info("inotify-handler <%s>: create on %s", description, ev->name); + log_debug("inotify-handler <%s>: create on %s", description, ev->name); if (!streq(ev->name, "sub")) { assert_se(safe_atou(ev->name, &i) >= 0); @@ -483,7 +483,7 @@ static void test_inotify(unsigned n_create_events) { } int main(int argc, char *argv[]) { - test_setup_logging(LOG_DEBUG); + test_setup_logging(LOG_INFO); test_basic(); test_sd_event_now(); diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index a3239d73f5..b54b5e76c6 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -341,7 +341,7 @@ static void test_is_wanted_print(bool header) { log_info("cmdline: %s", cmdline); if (header) { - log_info(_CGROUP_HIEARCHY_); + log_info(_CGROUP_HIERARCHY_); (void) system("findmnt -n /sys/fs/cgroup"); } |