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: Drop pkgconfig reference to libsystemd-id128.
[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 4b73ac79069da55c221958649c2048a812aa5628..8e1d08d59608e41c8721962974c7331206ca465a 100644
(file)
--- a/
src/journal/test-journal-stream.c
+++ b/
src/journal/test-journal-stream.c
@@
-75,11
+75,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;
-
sd_journal _cleanup_journal_close_
*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));
@@
-126,7
+130,7
@@
int main(int argc, char *argv[]) {
assert_se(sd_journal_add_match(j, "MAGIC=quux", 0) >= 0);
SD_JOURNAL_FOREACH_BACKWARDS(j) {
assert_se(sd_journal_add_match(j, "MAGIC=quux", 0) >= 0);
SD_JOURNAL_FOREACH_BACKWARDS(j) {
-
char _cleanup_free_
*c;
+
_cleanup_free_ char
*c;
assert_se(sd_journal_get_data(j, "NUMBER", &data, &l) >= 0);
printf("\t%.*s\n", (int) l, (const char*) data);
assert_se(sd_journal_get_data(j, "NUMBER", &data, &l) >= 0);
printf("\t%.*s\n", (int) l, (const char*) data);
@@
-136,7
+140,7
@@
int main(int argc, char *argv[]) {
}
SD_JOURNAL_FOREACH(j) {
}
SD_JOURNAL_FOREACH(j) {
-
char _cleanup_free_
*c;
+
_cleanup_free_ char
*c;
assert_se(sd_journal_get_data(j, "NUMBER", &data, &l) >= 0);
printf("\t%.*s\n", (int) l, (const char*) data);
assert_se(sd_journal_get_data(j, "NUMBER", &data, &l) >= 0);
printf("\t%.*s\n", (int) l, (const char*) data);