From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from mout.gmx.net ([212.227.15.19]:53630 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933344AbbCQKio (ORCPT ); Tue, 17 Mar 2015 06:38:44 -0400 From: Ruediger Meier To: util-linux@vger.kernel.org Cc: Sami Kerola Subject: [PATCH] tests: skip when logger --journald is not supported Date: Tue, 17 Mar 2015 11:38:41 +0100 Message-Id: <1426588721-32688-1-git-send-email-sweet_f_a@gmx.de> Sender: util-linux-owner@vger.kernel.org List-ID: From: Ruediger Meier Followup a0fd24e0. "SKIP" instead of "KNOWN FAIL" to avoid ugly test diff in case we don't have --journald. CC: Sami Kerola Signed-off-by: Ruediger Meier --- 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