[PATCH] tests: skip when logger --journald is not supported

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>

Followup a0fd24e0. "SKIP" instead of "KNOWN FAIL" to avoid ugly test
diff in case we don't have --journald.

CC: Sami Kerola <kerolasa@xxxxxx>
Signed-off-by: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux