X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal-interleaving.c;h=23a26c43f633814042e83cfae38fd691efb77f60;hp=5c9604472e7f4dad54a6c73e6760548027e08b78;hb=79008bddf679a5e0900369950eb346c9fa687107;hpb=348ced909724a1331b85d57aede80a102a00e428 diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 5c9604472..23a26c43f 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -23,7 +23,7 @@ #include #include -#include +#include "systemd/sd-journal.h" #include "journal-file.h" #include "journal-internal.h" @@ -37,9 +37,9 @@ static bool arg_keep = false; noreturn static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) { - log_meta(LOG_CRIT, file, line, func, - "'%s' failed at %s:%u (%s): %s.", - text, file, line, func, strerror(eno)); + log_internal(LOG_CRIT, 0, file, line, func, + "'%s' failed at %s:%u (%s): %s.", + text, file, line, func, strerror(eno)); abort(); } @@ -189,7 +189,7 @@ static void test_skip(void (*setup)(void)) { if (arg_keep) log_info("Not removing %s", t); else { - journal_directory_vacuum(".", 3000000, 0, NULL); + journal_directory_vacuum(".", 3000000, 0, NULL, true); assert_se(rm_rf_dangerous(t, false, true, false) >= 0); } @@ -274,7 +274,7 @@ static void test_sequence_numbers(void) { if (arg_keep) log_info("Not removing %s", t); else { - journal_directory_vacuum(".", 3000000, 0, NULL); + journal_directory_vacuum(".", 3000000, 0, NULL, true); assert_se(rm_rf_dangerous(t, false, true, false) >= 0); }