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

tridge at samba.org tridge at samba.org
Fri Dec 8 03:47:56 GMT 2006


Author: tridge
Date: 2006-12-08 03:47:55 +0000 (Fri, 08 Dec 2006)
New Revision: 20078

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

Log:

support the large samba3 reads in RAW-READ test

Modified:
   branches/SAMBA_4_0/source/torture/raw/read.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/read.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/read.c	2006-12-08 03:47:02 UTC (rev 20077)
+++ branches/SAMBA_4_0/source/torture/raw/read.c	2006-12-08 03:47:55 UTC (rev 20078)
@@ -482,8 +482,8 @@
 	CHECK_VALUE(io.readx.out.remaining, 0xFFFF);
 	CHECK_VALUE(io.readx.out.compaction_mode, 0);
 	if (lp_parm_bool(-1, "torture", "samba3", False)) {
-		printf("SAMBA3: ignore wrong nread[%d] should be [%d]\n",
-			io.readx.out.nread, 0);
+		printf("SAMBA3: large read extension\n");
+		CHECK_VALUE(io.readx.out.nread, 80000);
 	} else {
 		CHECK_VALUE(io.readx.out.nread, 0);
 	}
@@ -525,12 +525,22 @@
 		io.readx.in.maxcnt = 0x10000;
 		status = smb_raw_read(cli->tree, &io);
 		CHECK_STATUS(status, NT_STATUS_OK);
-		CHECK_VALUE(io.readx.out.nread, 0);
+		if (lp_parm_bool(-1, "torture", "samba3", False)) {
+			printf("SAMBA3: large read extension\n");
+			CHECK_VALUE(io.readx.out.nread, 0x10000);
+		} else {
+			CHECK_VALUE(io.readx.out.nread, 0);
+		}
 
 		io.readx.in.maxcnt = 0x10001;
 		status = smb_raw_read(cli->tree, &io);
 		CHECK_STATUS(status, NT_STATUS_OK);
-		CHECK_VALUE(io.readx.out.nread, 0);
+		if (lp_parm_bool(-1, "torture", "samba3", False)) {
+			printf("SAMBA3: large read extension\n");
+			CHECK_VALUE(io.readx.out.nread, 0x10001);
+		} else {
+			CHECK_VALUE(io.readx.out.nread, 0);
+		}
 	}
 
 	printf("Trying locked region\n");



More information about the samba-cvs mailing list