chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: various simplifications
[elogind.git]
/
src
/
journal
/
test-journal-stream.c
diff --git
a/src/journal/test-journal-stream.c
b/src/journal/test-journal-stream.c
index 4aba7febc7f197eca1b051a32aaedd1831e1d524..3996e778e666d43e6bbb79cad77541087fccaec2 100644
(file)
--- a/
src/journal/test-journal-stream.c
+++ b/
src/journal/test-journal-stream.c
@@
-22,19
+22,20
@@
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-#include
<systemd/sd-journal.h>
+#include
"systemd/sd-journal.h"
#include "journal-file.h"
#include "journal-internal.h"
#include "util.h"
#include "log.h"
#include "journal-file.h"
#include "journal-internal.h"
#include "util.h"
#include "log.h"
+#include "macro.h"
#define N_ENTRIES 200
static void verify_contents(sd_journal *j, unsigned skip) {
unsigned i;
#define N_ENTRIES 200
static void verify_contents(sd_journal *j, unsigned skip) {
unsigned i;
- assert(j);
+ assert
_se
(j);
i = 0;
SD_JOURNAL_FOREACH(j) {
i = 0;
SD_JOURNAL_FOREACH(j) {
@@
-75,11
+76,15
@@
int main(int argc, char *argv[]) {
JournalFile *one, *two, *three;
char t[] = "/tmp/journal-stream-XXXXXX";
unsigned i;
JournalFile *one, *two, *three;
char t[] = "/tmp/journal-stream-XXXXXX";
unsigned i;
- _cleanup_journal_close_ sd_journal*j = NULL;
+ _cleanup_journal_close_ sd_journal
*j = NULL;
char *z;
const void *data;
size_t l;
char *z;
const void *data;
size_t l;
+ /* journal_file_open requires a valid machine id */
+ if (access("/etc/machine-id", F_OK) != 0)
+ return EXIT_TEST_SKIP;
+
log_set_max_level(LOG_DEBUG);
assert_se(mkdtemp(t));
log_set_max_level(LOG_DEBUG);
assert_se(mkdtemp(t));