chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-gatewayd: minor cleanup
[elogind.git]
/
src
/
journal
/
test-journal.c
diff --git
a/src/journal/test-journal.c
b/src/journal/test-journal.c
index 9e1a4f57baba4cf2e74da66ec8e8db6ff5a693da..f4dc52cd8195afa814c415162fac1840305ed94b 100644
(file)
--- a/
src/journal/test-journal.c
+++ b/
src/journal/test-journal.c
@@
-24,14
+24,16
@@
#include <systemd/sd-journal.h>
#include <systemd/sd-journal.h>
-#include "journal-file.h"
#include "log.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;
JournalFile *f;
struct iovec iovec;
int main(int argc, char *argv[]) {
dual_timestamp ts;
JournalFile *f;
struct iovec iovec;
- static const char test[] = "
test", test2[] = "test
2";
+ static const char test[] = "
TEST1=1", test2[] = "TEST2=
2";
Object *o;
uint64_t p;
char t[] = "/tmp/journal-XXXXXX";
Object *o;
uint64_t p;
char t[] = "/tmp/journal-XXXXXX";
@@
-41,7
+43,7
@@
int main(int argc, char *argv[]) {
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);
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);
dual_timestamp_get(&ts);
@@
-57,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);
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);
journal_file_dump(f);
assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1);
@@
-109,16
+114,16
@@
int main(int argc, char *argv[]) {
assert(journal_file_move_to_entry_by_seqnum(f, 10, DIRECTION_DOWN, &o, NULL) == 0);
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);
journal_file_close(f);
- journal_directory_vacuum(".", 3000000, 0);
+ journal_directory_vacuum(".", 3000000, 0
, 0, NULL
);
log_error("Exiting...");
log_error("Exiting...");
- assert_se(rm_rf(t, false, true, false) >= 0);
+ assert_se(rm_rf
_dangerous
(t, false, true, false) >= 0);
return 0;
}
return 0;
}