From patchwork Fri Feb 27 03:30:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 5897591 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DCAEBF440 for ; Fri, 27 Feb 2015 03:31:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA11620212 for ; Fri, 27 Feb 2015 03:31:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C3BA201D3 for ; Fri, 27 Feb 2015 03:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753539AbbB0Dbw (ORCPT ); Thu, 26 Feb 2015 22:31:52 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:32931 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753337AbbB0Dbu convert rfc822-to-8bit (ORCPT ); Thu, 26 Feb 2015 22:31:50 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="58732474" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Feb 2015 11:28:11 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t1R3UvGQ032642 for ; Fri, 27 Feb 2015 11:30:57 +0800 Received: from localhost.localdomain (10.167.226.114) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Fri, 27 Feb 2015 11:31:53 +0800 From: Zhaolei To: CC: Zhao Lei Subject: [PATCH v4 2/2] Fix warning of "Usage: _is_block_dev dev" Date: Fri, 27 Feb 2015 11:30:36 +0800 Message-ID: X-Mailer: git-send-email 1.8.5.1 In-Reply-To: References: MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Zhao Lei _is_block_dev() will show above warning when "$dev" is not exist. It happened when the program check $TEST_DEV with blank $SCRATCH_DEV which is optional. Changelog v3->v4: Fix problem by adding quotes to _is_block_dev()'s argument. Suggested by: Lukáš Czerner Changelog v2->v3: Separate __same_block_dev() from _is_block_dev() to make code self documenting. Suggested by: Dave Chinner Changelog v1->v2: Rewrite _is_block_dev() to make caller code simple. Suggested by: Dave Chinner Suggested-by: Lukáš Czerner Suggested-by: Dave Chinner Signed-off-by: Zhao Lei --- common/rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/rc b/common/rc index 23193c8..7ae0933 100644 --- a/common/rc +++ b/common/rc @@ -1095,11 +1095,11 @@ _require_scratch_nocheck() fi ;; *) - if [ -z "$SCRATCH_DEV" -o "`_is_block_dev $SCRATCH_DEV`" = "" ] + if [ -z "$SCRATCH_DEV" -o "`_is_block_dev "$SCRATCH_DEV"`" = "" ] then _notrun "this test requires a valid \$SCRATCH_DEV" fi - if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ] + if [ "`_is_block_dev "$SCRATCH_DEV"`" = "`_is_block_dev "$TEST_DEV"/`" ] then _notrun "this test requires a valid \$SCRATCH_DEV" fi @@ -1167,11 +1167,11 @@ _require_test() fi ;; *) - if [ -z "$TEST_DEV" -o "`_is_block_dev $TEST_DEV`" = "" ] + if [ -z "$TEST_DEV" -o "`_is_block_dev "$TEST_DEV"`" = "" ] then _notrun "this test requires a valid \$TEST_DEV" fi - if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ] + if [ "`_is_block_dev "$SCRATCH_DEV"`" = "`_is_block_dev "$TEST_DEV"`" ] then _notrun "this test requires a valid \$TEST_DEV" fi @@ -2236,10 +2236,10 @@ _require_scratch_dev_pool() esac for i in $SCRATCH_DEV_POOL; do - if [ "`_is_block_dev $i`" = "" ]; then + if [ "`_is_block_dev "$i"`" = "" ]; then _notrun "this test requires valid block disk $i" fi - if [ "`_is_block_dev $i`" = "`_is_block_dev $TEST_DEV`" ]; then + if [ "`_is_block_dev "$i"`" = "`_is_block_dev "$TEST_DEV"`" ]; then _notrun "$i is part of TEST_DEV, this test requires unique disks" fi if _mount | grep -q $i; then