* [PATCH] tests: skip when logger --journald is not supported
@ 2015-03-17 10:38 Ruediger Meier
2015-03-17 10:51 ` Ruediger Meier
0 siblings, 1 reply; 3+ messages in thread
From: Ruediger Meier @ 2015-03-17 10:38 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tests: skip when logger --journald is not supported
2015-03-17 10:38 [PATCH] tests: skip when logger --journald is not supported Ruediger Meier
@ 2015-03-17 10:51 ` Ruediger Meier
2015-03-17 11:19 ` Karel Zak
0 siblings, 1 reply; 3+ messages in thread
From: Ruediger Meier @ 2015-03-17 10:51 UTC (permalink / raw)
To: util-linux
I see you've fixed this already, so forget about it.
On Tuesday 17 March 2015, Ruediger Meier wrote:
> 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" |
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tests: skip when logger --journald is not supported
2015-03-17 10:51 ` Ruediger Meier
@ 2015-03-17 11:19 ` Karel Zak
0 siblings, 0 replies; 3+ messages in thread
From: Karel Zak @ 2015-03-17 11:19 UTC (permalink / raw)
To: Ruediger Meier; +Cc: util-linux
On Tue, Mar 17, 2015 at 11:51:58AM +0100, Ruediger Meier wrote:
> I see you've fixed this already, so forget about it.
Yeah, I have enabled my drone.io too and fixed some another issues,
but for now I'm going to do something else to avoid collisions. It
seems you're working on the same things :-)
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-17 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-17 10:38 [PATCH] tests: skip when logger --journald is not supported Ruediger Meier
2015-03-17 10:51 ` Ruediger Meier
2015-03-17 11:19 ` Karel Zak
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.