svn commit: samba r15690 - in branches/SAMBA_4_0/source/torture/raw: .

[metze at samba.org]

Author: metze
Date: 2006-05-18 12:17:56 +0000 (Thu, 18 May 2006)
New Revision: 15690

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15690

Log:
- disable the lock cancel test against samba3
- disable the LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT test against samba3

metze
Modified:
   branches/SAMBA_4_0/source/torture/raw/lock.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lock.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/lock.c	2006-05-18 11:21:17 UTC (rev 15689)
+++ branches/SAMBA_4_0/source/torture/raw/lock.c	2006-05-18 12:17:56 UTC (rev 15690)
@@ -462,6 +462,11 @@
 	time_t t;
 	struct smbcli_request *req;
 
+	if (lp_parm_bool(-1, "target", "samba3", False)) {
+		printf("SAMBA3: ignore testing LOCKING_ANDX_CANCEL_LOCK...\n");
+		return True;
+	}
+
 	if (!torture_setup_dir(cli, BASEDIR)) {
 		return False;
 	}
@@ -791,6 +796,11 @@
 	time_t start;
 	int t;
 
+	if (lp_parm_bool(-1, "target", "samba3", False)) {
+		printf("SAMBA3: ignore testing LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT...\n");
+		return True;
+	}
+
 	if (!torture_setup_dir(cli, BASEDIR)) {
 		return False;
 	}