From patchwork Wed Aug 6 12:01:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 4685361 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 405C89F433 for ; Wed, 6 Aug 2014 12:01:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62EAA20145 for ; Wed, 6 Aug 2014 12:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A29E2015A for ; Wed, 6 Aug 2014 12:01:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753680AbaHFMBc (ORCPT ); Wed, 6 Aug 2014 08:01:32 -0400 Received: from mail-lb0-f169.google.com ([209.85.217.169]:59858 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754795AbaHFMBb (ORCPT ); Wed, 6 Aug 2014 08:01:31 -0400 Received: by mail-lb0-f169.google.com with SMTP id s7so1822106lbd.14 for ; Wed, 06 Aug 2014 05:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NmSO3tbIX6YpP4ILqHgQHHJRgJKejZZrX/HUBKqzkDo=; b=yBH/eFwtjVHceF8jSntcyVWgCvMOE7dVLwYusFoQYWnWprtanxVUHovbU4X4aEjzeP ES99Uv/8O2Ko2CV/UBB7diAL6r0FD036xL+wLjxOIBibBLO4ovn+nPK6FTupqpb2emOp PDnlr5saXEo2Hm7yCC9elnSRmHj9mquwBA9KvAj4RtBB6xV8MnwH7/bLaVSodSiiob4k 15WkXFJffXFa2nb1CxQIhAiB4OvVUx3QJFMNeDRFMKig1wrFeMPddEH3ps1qxZE+bqdS +a1MYaQqSRxIIPDxy8vEW7ZHG1tyJzrj/I18qSCoyYPWH8SN0N5VtZrgmDy349PxyLGc 42QA== X-Received: by 10.152.245.9 with SMTP id xk9mr10852435lac.80.1407326489985; Wed, 06 Aug 2014 05:01:29 -0700 (PDT) Received: from localhost.localdomain ([92.43.3.121]) by mx.google.com with ESMTPSA id xl2sm1136496lbb.47.2014.08.06.05.01.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Aug 2014 05:01:28 -0700 (PDT) From: Pavel Shilovsky To: Steve Dickson Cc: linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, Jeff Layton Subject: [PATCH 3/5] Add capability to test SMB 2.0 and higher verions Date: Wed, 6 Aug 2014 16:01:10 +0400 Message-Id: <1407326472-13853-4-git-send-email-pshilovsky@samba.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1407326472-13853-1-git-send-email-pshilovsky@samba.org> References: <1407326472-13853-1-git-send-email-pshilovsky@samba.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: Pavel Shilovsky --- lock/runtests | 5 +++-- special/runtests.wrk | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lock/runtests b/lock/runtests index 006742e..21b09a5 100644 --- a/lock/runtests +++ b/lock/runtests @@ -36,7 +36,7 @@ case $TESTARG in -t) TESTARGS="-r" ;; esac -if echo "$mntopts" | grep vers=2 > /dev/null +if [ "$CIFS" != "yes" ] && echo "$mntopts" | grep vers=2 > /dev/null then TESTARGS="-v 2 $TESTARGS" fi @@ -52,7 +52,8 @@ do tlock) echo 'Testing native pre-LFS locking';; tlocklfs) echo 'Testing native post-LFS locking';; tlock64) - if echo "$mntopts" | grep vers=2 > /dev/null + if [ "$CIFS" != "yes" ] && + echo "$mntopts" | grep vers=2 > /dev/null then echo "64-bit locking not supported with NFS v2" echo " " diff --git a/special/runtests.wrk b/special/runtests.wrk index a941d33..8f099fa 100644 --- a/special/runtests.wrk +++ b/special/runtests.wrk @@ -25,7 +25,12 @@ TMPDIR= ./op_unlk echo "" echo "check for proper open/rename operation" -TMPDIR= ./op_ren +if [ "$CIFS" = "yes" ] && echo $MNTOPTIONS | grep -E "vers=2|vers=3" > /dev/null +then + echo "skipping test; not supported by SMB 2.0 and higher versions" +else + TMPDIR= ./op_ren +fi echo "" echo "check for proper open/chmod 0 operation" @@ -93,7 +98,7 @@ echo "write/read" $size "MB file" echo "" echo "write/read at 2GB, 4GB edges" -if echo $MNTOPTIONS | grep vers=2 > /dev/null +if [ "$CIFS" != "yes" ] && echo $MNTOPTIONS | grep vers=2 > /dev/null then echo "skipping test; not supported with v2" else