From: Anna Schumaker <Anna.Schumaker@netapp.com> To: fstests@vger.kernel.org, hch@infradead.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH] common: Fixes for testing NFS over IPv6 Date: Wed, 29 Oct 2014 15:32:07 -0400 [thread overview] Message-ID: <1414611127-14246-1-git-send-email-Anna.Schumaker@Netapp.com> (raw) 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 <Anna.Schumaker@Netapp.com> --- 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 -- 2.1.2
WARNING: multiple messages have this Message-ID (diff)
From: Anna Schumaker <Anna.Schumaker@netapp.com> To: <fstests@vger.kernel.org>, <hch@infradead.org> Cc: <linux-nfs@vger.kernel.org> Subject: [PATCH] common: Fixes for testing NFS over IPv6 Date: Wed, 29 Oct 2014 15:32:07 -0400 [thread overview] Message-ID: <1414611127-14246-1-git-send-email-Anna.Schumaker@Netapp.com> (raw) 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 <Anna.Schumaker@Netapp.com> --- 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 -- 2.1.2
next reply other threads:[~2014-10-29 19:32 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-29 19:32 Anna Schumaker [this message] 2014-10-29 19:32 ` [PATCH] common: Fixes for testing NFS over IPv6 Anna Schumaker 2014-10-29 23:33 ` Dave Chinner 2014-10-30 12:42 ` Anna Schumaker 2014-10-30 12:42 ` Anna Schumaker
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1414611127-14246-1-git-send-email-Anna.Schumaker@Netapp.com \ --to=anna.schumaker@netapp.com \ --cc=fstests@vger.kernel.org \ --cc=hch@infradead.org \ --cc=linux-nfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.