test: allow deletion of temporary files from normal fs

[elogind.git] / src / journal / test-journal.c

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 45ced12b46ef3ca89e8278003c10c8fca4399f0f..ca3b4741f57ddfe675b68ad6395f80cf981724ee 100644 (file)
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -6,22 +6,24 @@
   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 <systemd/sd-journal.h>
+
 #include "journal-file.h"
 #include "log.h"
 
@@ -32,12 +34,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, NULL, NULL, &f) == 0);
 
         dual_timestamp_get(&ts);
 
@@ -112,5 +116,9 @@ int main(int argc, char *argv[]) {
 
         journal_directory_vacuum(".", 3000000, 0);
 
+        log_error("Exiting...");
+
+        assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
+
         return 0;
 }