X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal-interleaving.c;h=3c706018e93bd7ea921b0a0a04f1cf0dcbe3b33f;hb=56e6c2abb8f18bba2bb9d96d66ac7e633349ddfb;hp=5c9604472e7f4dad54a6c73e6760548027e08b78;hpb=348ced909724a1331b85d57aede80a102a00e428;p=elogind.git

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 5c9604472..3c706018e 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <systemd/sd-journal.h>
+#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);
         }
@@ -212,43 +212,43 @@ static void test_sequence_numbers(void) {
 
         append_number(one, 1, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 1);
+        assert_se(seqnum == 1);
         append_number(one, 2, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 2);
+        assert_se(seqnum == 2);
 
-        assert(one->header->state == STATE_ONLINE);
-        assert(!sd_id128_equal(one->header->file_id, one->header->machine_id));
-        assert(!sd_id128_equal(one->header->file_id, one->header->boot_id));
-        assert(sd_id128_equal(one->header->file_id, one->header->seqnum_id));
+        assert_se(one->header->state == STATE_ONLINE);
+        assert_se(!sd_id128_equal(one->header->file_id, one->header->machine_id));
+        assert_se(!sd_id128_equal(one->header->file_id, one->header->boot_id));
+        assert_se(sd_id128_equal(one->header->file_id, one->header->seqnum_id));
 
         memcpy(&seqnum_id, &one->header->seqnum_id, sizeof(sd_id128_t));
 
         assert_se(journal_file_open("two.journal", O_RDWR|O_CREAT, 0644,
                                     true, false, NULL, NULL, one, &two) == 0);
 
-        assert(two->header->state == STATE_ONLINE);
-        assert(!sd_id128_equal(two->header->file_id, one->header->file_id));
-        assert(sd_id128_equal(one->header->machine_id, one->header->machine_id));
-        assert(sd_id128_equal(one->header->boot_id, one->header->boot_id));
-        assert(sd_id128_equal(one->header->seqnum_id, one->header->seqnum_id));
+        assert_se(two->header->state == STATE_ONLINE);
+        assert_se(!sd_id128_equal(two->header->file_id, one->header->file_id));
+        assert_se(sd_id128_equal(one->header->machine_id, one->header->machine_id));
+        assert_se(sd_id128_equal(one->header->boot_id, one->header->boot_id));
+        assert_se(sd_id128_equal(one->header->seqnum_id, one->header->seqnum_id));
 
         append_number(two, 3, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 3);
+        assert_se(seqnum == 3);
         append_number(two, 4, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 4);
+        assert_se(seqnum == 4);
 
         test_close(two);
 
         append_number(one, 5, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 5);
+        assert_se(seqnum == 5);
 
         append_number(one, 6, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 6);
+        assert_se(seqnum == 6);
 
         test_close(one);
 
@@ -258,11 +258,11 @@ static void test_sequence_numbers(void) {
         assert_se(journal_file_open("two.journal", O_RDWR, 0,
                                     true, false, NULL, NULL, NULL, &two) == 0);
 
-        assert(sd_id128_equal(two->header->seqnum_id, seqnum_id));
+        assert_se(sd_id128_equal(two->header->seqnum_id, seqnum_id));
 
         append_number(two, 7, &seqnum);
         printf("seqnum=%"PRIu64"\n", seqnum);
-        assert(seqnum == 5);
+        assert_se(seqnum == 5);
 
         /* So..., here we have the same seqnum in two files with the
          * same seqnum_id. */
@@ -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);
         }