From patchwork Wed Aug 15 20:37:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10566833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E0D41669 for ; Wed, 15 Aug 2018 20:37:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ED5F2AFBA for ; Wed, 15 Aug 2018 20:37:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12EAE2B020; Wed, 15 Aug 2018 20:37:43 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC85C2B000 for ; Wed, 15 Aug 2018 20:37:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727879AbeHOXbZ (ORCPT ); Wed, 15 Aug 2018 19:31:25 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:23654 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726763AbeHOXbZ (ORCPT ); Wed, 15 Aug 2018 19:31:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1534365461; x=1565901461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2cOS6mI1395x4wwhk6j3WX/YFt1XWiE17jvo0bULPLc=; b=eOwqoNmXp1I/VGI6uPKWorxfalnLBrQjVkSwYAHcX6wQPdEOTLMYN5oU UGekz7KsbpN/WXsn5t85Ig2PyVznamejW6rmBOIq3ki2x1Zsana8ZZpSC eGZjKwW3vuVI6fPrPR03H5t38hNDRsYWh+Qgog0F0bh7OhvFgOr4fspZj OFncszKf1Oo/L6afoT5vfhr1pqfSt6TMxH3As/kNNNJAKA+dOZ7Mi6rEG exrPgeXzDmGxUolMGPkDSchLoYsNsvkSPCd0w3wxXw3YdtSm2c3nDOppI Lpjk42giqz7ZkmbILhyVzqy9Kdbi50GZvqqRN5furD1+UtEscl4T3XVPZ w==; X-IronPort-AV: E=Sophos;i="5.53,244,1531756800"; d="scan'208";a="191631624" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 16 Aug 2018 04:37:29 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 15 Aug 2018 13:24:52 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip02.wdc.com with ESMTP; 15 Aug 2018 13:37:29 -0700 From: Bart Van Assche To: Omar Sandoval Cc: Mike Snitzer , Johannes Thumshirn , linux-block@vger.kernel.org, Bart Van Assche Subject: [PATCH blktests 2/3] tests/srp: Remove /etc/multipath.conf after a test has finished Date: Wed, 15 Aug 2018 13:37:27 -0700 Message-Id: <20180815203728.19521-3-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180815203728.19521-1-bart.vanassche@wdc.com> References: <20180815203728.19521-1-bart.vanassche@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of removing /etc/multipath.conf before a test starts, remove it after a test has finished. This change is needed to let the nvmeof-mp tests run after the srp tests have been run. Signed-off-by: Bart Van Assche --- tests/srp/rc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/srp/rc b/tests/srp/rc index 7484b9513252..e93eaab996f4 100755 --- a/tests/srp/rc +++ b/tests/srp/rc @@ -103,12 +103,6 @@ group_requires() { SKIP_REASON="/etc/multipath.conf already exists" return 1 fi - if [ ! -e /etc/multipath.conf ]; then - ( - srcdir=$PWD - cd /etc && ln -s "$srcdir/tests/srp/multipath.conf" . - ) - fi } # Log out, set dm and SCSI use_blk_mq parameters and log in. $1: device mapper @@ -1202,6 +1196,7 @@ shutdown_client() { # Undo setup() teardown() { killall -9 multipathd >&/dev/null + rm -f /etc/multipath.conf stop_target unload_null_blk } @@ -1236,6 +1231,12 @@ setup() { configure_null_blk + if [ ! -e /etc/multipath.conf ]; then + ( + srcdir=$PWD + cd /etc && ln -s "$srcdir/tests/srp/multipath.conf" . + ) + fi multipathd # Load the I/O scheduler kernel modules