summaryrefslogtreecommitdiffstats
path: root/lock
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilovsky@samba.org>2014-08-12 12:33:37 -0400
committerSteve Dickson <steved@redhat.com>2014-08-12 14:39:55 -0400
commit53cddd8d4c52a1566d3dcb8eedd316413da6f5ad (patch)
treeef9024f82dadb388eeaeb0575757dff0cf8fabfe /lock
parent99eb35e09db27e797fbb0c0a0ab385ed683b0f9b (diff)
downloadcthon04-53cddd8d4c52a1566d3dcb8eedd316413da6f5ad.tar.gz
cthon04-53cddd8d4c52a1566d3dcb8eedd316413da6f5ad.tar.xz
cthon04-53cddd8d4c52a1566d3dcb8eedd316413da6f5ad.zip
Add capability to test SMB 2.0 and higher verions
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'lock')
-rwxr-xr-xlock/runtests5
1 files changed, 3 insertions, 2 deletions
diff --git a/lock/runtests b/lock/runtests
index 006742e..21b09a5 100755
--- 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 " "