X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal.c;h=22735001001320999a8bfdb34b1accaa542535bb;hb=feb12d3ed2c7f9132c64773c7c41b9e3a608a814;hp=39f4c167789d3cec08189e064b575b60696a71e4;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 39f4c1677..227350010 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -24,8 +24,10 @@
 
 #include <systemd/sd-journal.h>
 
-#include "journal-file.h"
 #include "log.h"
+#include "journal-file.h"
+#include "journal-authenticate.h"
+#include "journal-vacuum.h"
 
 int main(int argc, char *argv[]) {
         dual_timestamp ts;
@@ -34,12 +36,14 @@ int main(int argc, char *argv[]) {
         static const char test[] = "test", test2[] = "test2";
         Object *o;
         uint64_t p;
+        char t[] = "/tmp/journal-XXXXXX";
 
         log_set_max_level(LOG_DEBUG);
 
-        unlink("test.journal");
+        assert_se(mkdtemp(t));
+        assert_se(chdir(t) >= 0);
 
-        assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, NULL, &f) == 0);
+        assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, true, true, NULL, NULL, NULL, &f) == 0);
 
         dual_timestamp_get(&ts);
 
@@ -55,6 +59,9 @@ int main(int argc, char *argv[]) {
         iovec.iov_len = strlen(test);
         assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
 
+#ifdef HAVE_GCRYPT
+        journal_file_append_tag(f);
+#endif
         journal_file_dump(f);
 
         assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1);
@@ -107,8 +114,8 @@ int main(int argc, char *argv[]) {
 
         assert(journal_file_move_to_entry_by_seqnum(f, 10, DIRECTION_DOWN, &o, NULL) == 0);
 
-        journal_file_rotate(&f);
-        journal_file_rotate(&f);
+        journal_file_rotate(&f, true, true);
+        journal_file_rotate(&f, true, true);
 
         journal_file_close(f);
 
@@ -116,5 +123,7 @@ int main(int argc, char *argv[]) {
 
         log_error("Exiting...");
 
+        assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
+
         return 0;
 }