X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Ftest-journal-stream.c;h=8e1d08d59608e41c8721962974c7331206ca465a;hp=caea2b2c6304dd6ef2408e3fdee04b4834f10e94;hb=a69f4254a82765cd0c7f155d5dc86e0768ea0ef3;hpb=c6511e859c35b12de4e6fb5f58d7258d9de3b8f2

diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index caea2b2c6..8e1d08d59 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -75,8 +75,14 @@ int main(int argc, char *argv[]) {
         JournalFile *one, *two, *three;
         char t[] = "/tmp/journal-stream-XXXXXX";
         unsigned i;
-        sd_journal *j;
+        _cleanup_journal_close_ sd_journal *j = NULL;
         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);
 
@@ -124,29 +130,23 @@ int main(int argc, char *argv[]) {
 
         assert_se(sd_journal_add_match(j, "MAGIC=quux", 0) >= 0);
         SD_JOURNAL_FOREACH_BACKWARDS(j) {
-                const void *d;
-                size_t l;
-                char *c;
+                _cleanup_free_ char *c;
 
-                assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0);
-                printf("\t%.*s\n", (int) l, (const char*) d);
+                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_cursor(j, &c) >= 0);
                 assert_se(sd_journal_test_cursor(j, c) > 0);
-                free(c);
         }
 
         SD_JOURNAL_FOREACH(j) {
-                const void *d;
-                size_t l;
-                char *c;
+                _cleanup_free_ char *c;
 
-                assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0);
-                printf("\t%.*s\n", (int) l, (const char*) d);
+                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_cursor(j, &c) >= 0);
                 assert_se(sd_journal_test_cursor(j, c) > 0);
-                free(c);
         }
 
         sd_journal_flush_matches(j);
@@ -175,7 +175,9 @@ int main(int argc, char *argv[]) {
 
         verify_contents(j, 0);
 
-        sd_journal_close(j);
+        assert_se(sd_journal_query_unique(j, "NUMBER") >= 0);
+        SD_JOURNAL_FOREACH_UNIQUE(j, data, l)
+                printf("%.*s\n", (int) l, (const char*) data);
 
         assert_se(rm_rf_dangerous(t, false, true, false) >= 0);