From: Ruediger Meier <sweet_f_a@gmx.de>
To: util-linux@vger.kernel.org
Cc: Sami Kerola <kerolasa@iki.fi>
Subject: [PATCH] tests: skip when logger --journald is not supported
Date: Tue, 17 Mar 2015 11:38:41 +0100 [thread overview]
Message-ID: <1426588721-32688-1-git-send-email-sweet_f_a@gmx.de> (raw)
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Followup a0fd24e0. "SKIP" instead of "KNOWN FAIL" to avoid ugly test
diff in case we don't have --journald.
CC: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
tests/ts/logger/journald | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/ts/logger/journald b/tests/ts/logger/journald
index 155aeae..cdc800c 100755
--- a/tests/ts/logger/journald
+++ b/tests/ts/logger/journald
@@ -25,8 +25,13 @@ ts_init "$*"
ts_check_test_command "$TS_HELPER_LOGGER"
-if ! $TS_HELPER_LOGGER --help | grep -q journald; then
- TS_KNOWN_FAIL="yes"
+
+# --help works and --journald is supported
+if ! $TS_HELPER_LOGGER --help | grep -q -- "--version"; then
+ ts_failed "logger --help"
+fi
+if ! $TS_HELPER_LOGGER --help | grep -q -- "--journald"; then
+ ts_skip "option --journald not supported"
fi
printf "%s\n%s\n%s\n" MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a MESSAGE="a b c 1 2 3" |
--
1.8.4.5
next reply other threads:[~2015-03-17 10:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 10:38 Ruediger Meier [this message]
2015-03-17 10:51 ` [PATCH] tests: skip when logger --journald is not supported Ruediger Meier
2015-03-17 11:19 ` Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426588721-32688-1-git-send-email-sweet_f_a@gmx.de \
--to=sweet_f_a@gmx.de \
--cc=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox