From patchwork Wed Oct 29 19:32:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 5191141 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E9421C11AC for ; Wed, 29 Oct 2014 19:32:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 510F820225 for ; Wed, 29 Oct 2014 19:32:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F87200F0 for ; Wed, 29 Oct 2014 19:32:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755588AbaJ2TcO (ORCPT ); Wed, 29 Oct 2014 15:32:14 -0400 Received: from mx12.netapp.com ([216.240.18.77]:31996 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756730AbaJ2TcN (ORCPT ); Wed, 29 Oct 2014 15:32:13 -0400 X-IronPort-AV: E=Sophos;i="5.07,279,1413270000"; d="scan'208";a="206757688" Received: from vmwexchts01-prd.hq.netapp.com ([10.122.105.12]) by mx12-out.netapp.com with ESMTP; 29 Oct 2014 12:32:13 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS01-PRD.hq.netapp.com (10.122.105.12) with Microsoft SMTP Server id 15.0.995.29; Wed, 29 Oct 2014 12:32:12 -0700 Received: from davros.com ([10.63.236.76]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id s9TJW9Js015108; Wed, 29 Oct 2014 12:32:09 -0700 (PDT) From: Anna Schumaker To: , CC: Subject: [PATCH] common: Fixes for testing NFS over IPv6 Date: Wed, 29 Oct 2014 15:32:07 -0400 Message-ID: <1414611127-14246-1-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.1.2 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 When testing NFS over IPv6, the user will set a $TEST_DEV of the form [fe80::42]:/export. The use of square brackets surrounding the IPv6 address is an accepted convention, but grep and awk think that our IPv6 address is actually a regex and tries to evaluate it instead. The result is that xfstests reports our filesystem "is busy or already mounted". This patch fixes the IPv6 problem by telling awk and grep to treat $TEST_DEV as a fixed string rather than a regex. Signed-off-by: Anna Schumaker --- common/rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index 747cf72..5f24eb0 100644 --- a/common/rc +++ b/common/rc @@ -810,13 +810,13 @@ _df_device() fi $DF_PROG 2>/dev/null | $AWK_PROG -v what=$1 ' - match($1,what) && NF==1 { + ($1==what) && (NF==1) { v=$1 getline print v, $0 exit } - match($1,what) { + ($1==what) { print exit } @@ -1132,10 +1132,10 @@ _require_test() esac # mounted? - if _mount | grep -q $TEST_DEV + if _mount | grep -F -q $TEST_DEV then # if it's mounted, make sure its on $TEST_DIR - if ! _mount | grep $TEST_DEV | grep -q $TEST_DIR + if ! _mount | grep -F $TEST_DEV | grep -q $TEST_DIR then echo "\$TEST_DEV is mounted but not on \$TEST_DIR - aborting" exit 1