system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 18:55:10 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

test: suppress logs generated by journal tests

Browse source 
Note, journal_file_dump() is only used by tests.

Closes #33035.
This commit is contained in:
Yu Watanabe 2024-05-28 14:05:15 +09:00 committed by Daan De Meyer
parent 61fdb5b214
commit 36c5035f2a
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libsystemd/sd-journal/journal-file.c
View file

@ -3801,35 +3801,35 @@ void journal_file_dump(JournalFile *f) {
case OBJECT_ENTRY:
assert(s);
printf("Type: %s seqnum=%"PRIu64" monotonic=%"PRIu64" realtime=%"PRIu64"\n",
s,
le64toh(o->entry.seqnum),
le64toh(o->entry.monotonic),
le64toh(o->entry.realtime));
log_info("Type: %s seqnum=%"PRIu64" monotonic=%"PRIu64" realtime=%"PRIu64"\n",
s,
le64toh(o->entry.seqnum),
le64toh(o->entry.monotonic),
le64toh(o->entry.realtime));
break;
case OBJECT_TAG:
assert(s);
printf("Type: %s seqnum=%"PRIu64" epoch=%"PRIu64"\n",
s,
le64toh(o->tag.seqnum),
le64toh(o->tag.epoch));
log_info("Type: %s seqnum=%"PRIu64" epoch=%"PRIu64"\n",
s,
le64toh(o->tag.seqnum),
le64toh(o->tag.epoch));
break;
default:
if (s)
printf("Type: %s \n", s);
log_info("Type: %s \n", s);
else
printf("Type: unknown (%i)", o->object.type);
log_info("Type: unknown (%i)", o->object.type);
break;
}
c = COMPRESSION_FROM_OBJECT(o);
if (c > COMPRESSION_NONE)
printf("Flags: %s\n",
compression_to_string(c));
log_info("Flags: %s\n",
compression_to_string(c));
if (p == le64toh(f->header->tail_object_offset))
p = 0;

12
test/units/TEST-02-UNITTESTS.sh
View file

@ -42,10 +42,20 @@ run_test() {
local test="$1"
local name="${test##*/}"
local environment=
echo "Executing test $name as unit $name.service"
systemd-run --quiet --property Delegate=1 --unit="$name" --wait "$test" && ret=0 || ret=$?
case "$name" in
test-journal-flush)
environment="SYSTEMD_LOG_LEVEL=info"
;;
test-journal-verify)
environment="SYSTEMD_LOG_LEVEL=crit"
;;
esac
systemd-run --quiet --property Delegate=1 --property "Environment=$environment" --unit="$name" --wait "$test" && ret=0 || ret=$?
exec {LOCK_FD}> /lock
flock --exclusive ${LOCK_FD}