X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal.c;h=05bb2ea8ed8b4d61eb08010492b5ca2c82761eb0;hb=0284adc6a60ce0af1107cb0b50041a65d731f39e;hp=3d429bea9051bbdbbad4f539bbcd7db8525c503a;hpb=dc1ecd78e9f046880d10ddb45cf9b06df1084b10;p=elogind.git

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 3d429bea9..05bb2ea8e 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -6,25 +6,28 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
-#include "journal-file.h"
+#include <systemd/sd-journal.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;
@@ -33,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);
 
@@ -54,6 +59,7 @@ 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);
 
+        journal_file_append_tag(f);
         journal_file_dump(f);
 
         assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1);
@@ -106,8 +112,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);
 
@@ -115,5 +121,7 @@ int main(int argc, char *argv[]) {
 
         log_error("Exiting...");
 
+        assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
+
         return 0;
 }