From patchwork Mon Sep 5 05:30:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9313069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6543560760 for ; Mon, 5 Sep 2016 05:31:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 577F628992 for ; Mon, 5 Sep 2016 05:31:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BA3928996; Mon, 5 Sep 2016 05:31:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DFE8E28992 for ; Mon, 5 Sep 2016 05:31:57 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id DD8237CA3; Mon, 5 Sep 2016 00:31:55 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 3A89D7CA1 for ; Mon, 5 Sep 2016 00:31:53 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 8AA8DAC001 for ; Sun, 4 Sep 2016 22:31:49 -0700 (PDT) X-ASG-Debug-ID: 1473053507-0bf57b15a614d7b0001-NocioJ Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id 3CyUGsMKfBxip09u (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sun, 04 Sep 2016 22:31:48 -0700 (PDT) X-Barracuda-Envelope-From: eguan@redhat.com X-Barracuda-Effective-Source-IP: mx1.redhat.com[209.132.183.28] X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54F4D85546; Mon, 5 Sep 2016 05:31:47 +0000 (UTC) Received: from localhost (dhcp-13-153.nay.redhat.com [10.66.13.153]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u855VkXX002717; Mon, 5 Sep 2016 01:31:46 -0400 From: Eryu Guan To: fstests@vger.kernel.org Subject: [PATCH] xfs/279: filter scsi debug device correctly Date: Mon, 5 Sep 2016 13:30:27 +0800 X-ASG-Orig-Subj: [PATCH] xfs/279: filter scsi debug device correctly Message-Id: <1473053427-15498-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 05 Sep 2016 05:31:47 +0000 (UTC) X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1473053508 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.176.25:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 814 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Cc: linux-xfs@vger.kernel.org, Eryu Guan , xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP This test assumes scsi debug device is "/dev/sd." when doing the filter, but that isn't always true, I've seen failure like -mkfs with opts: DEVICE +mkfs with opts: DEVICEl So use $SCSI_DEBUG_DEV to match the correct scsi debug device name. Signed-off-by: Eryu Guan Reviewed-by: Dave Chinner --- tests/xfs/279 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/279 b/tests/xfs/279 index cde7d21..9dee4cf 100755 --- a/tests/xfs/279 +++ b/tests/xfs/279 @@ -61,7 +61,7 @@ _wipe_device() _check_mkfs() { echo "===================" - echo "mkfs with opts: $@" | sed -e "s,/dev/sd.,DEVICE," + echo "mkfs with opts: $@" | sed -e "s,$SCSI_DEBUG_DEV,DEVICE," $MKFS_XFS_PROG $@ 2>/dev/null > $tmp.mkfs.full if [ $? -ne 0 ]; then echo "Failed."