From 9fc879d415053475907333f8110aadefdc088a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 1 Aug 2019 13:04:16 +0200 Subject: basic/build.h: fix typo --- src/basic/build.h | 4 ++-- src/test/test-cgroup-util.c | 2 +- 2 files changed, 3 insertions(+), 3 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/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"); } -- cgit v1.2.1 From 8788a568635a27267af61c9c85baf00b74ac161b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 2 Aug 2019 15:00:02 +0200 Subject: test-event: stop debugging spew Ubuntu autopkgtests print output from all tests, and test-event produces a lot of it. Let's cut it down to reasonable size. --- src/libsystemd/sd-event/test-event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); -- cgit v1.2.1 From a83577fa66966c4f8c2fbbcd4a9b266fb9c340aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 2 Aug 2019 15:07:56 +0200 Subject: test-journal-flush: provide at least *some* logs Ubunut autopkgtest fails with: 405/501 test-journal-flush FAIL 0.74 s (killed by signal 6 SIGABRT) --- command --- SYSTEMD_KBD_MODEL_MAP='/tmp/autopkgtest.BgjJJv/build.yAM/systemd/src/locale/kbd-model-map' SYSTEMD_LANGUAGE_FALLBACK_MAP='/tmp/autopkgtest.BgjJJv/build.yAM/systemd/src/locale/language-fallback-map' PATH='/tmp/autopkgtest.BgjJJv/build.yAM/systemd/build-deb:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games' /tmp/autopkgtest.BgjJJv/build.yAM/systemd/build-deb/test-journal-flush --- stderr --- Assertion 'r >= 0' failed at src/journal/test-journal-flush.c:48, function main(). Aborting. ------- It's hard to say what is going on here without any error messages whatsoever. The test goes into deep details of journal file handling, so it needs to also do logging on its own. --- src/journal/test-journal-flush.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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; } -- cgit v1.2.1 From be440e094c4b7786f264be02acee19b374dc6590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 6 Aug 2019 18:23:54 +0200 Subject: id128: actually support --pretty We must be all lazy, at least I know I always used -p ;). --- src/id128/id128.c | 1 + 1 file changed, 1 insertion(+) 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' }, {}, }; -- cgit v1.2.1