From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 26 Nov 2021 08:40:51 +0000 (+0100)
Subject: test-journal-flush: allow testing against specific files
X-Git-Tag: v250-rc1~140^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fa167cd58b5a4ffe16a332131df70bf77edddbe;p=thirdparty%2Fsystemd.git

test-journal-flush: allow testing against specific files

>=0 → ==0 because sd_journal_open* are documented to return 0.
---

diff --git a/src/libsystemd/sd-journal/test-journal-flush.c b/src/libsystemd/sd-journal/test-journal-flush.c
index dad277dd662..aa814225dda 100644
--- a/src/libsystemd/sd-journal/test-journal-flush.c
+++ b/src/libsystemd/sd-journal/test-journal-flush.c
@@ -29,8 +29,11 @@ int main(int argc, char *argv[]) {
         r = journal_file_open(-1, fn, O_CREAT|O_RDWR, 0644, false, 0, false, NULL, NULL, NULL, NULL, &new_journal);
         assert_se(r >= 0);
 
-        r = sd_journal_open(&j, 0);
-        assert_se(r >= 0);
+        if (argc > 1)
+                r = sd_journal_open_files(&j, (const char **) strv_skip(argv, 1), 0);
+        else
+                r = sd_journal_open(&j, 0);
+        assert_se(r == 0);
 
         sd_journal_set_data_threshold(j, 0);