summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-03-09 03:28:21 +0000
committerAndrew Tridgell <tridge@samba.org>2004-03-09 03:28:21 +0000
commit826661597ea603e35b4dcbd8e2a71e2900dccd7a (patch)
tree348c5a32adaee4c10af379ab1cb959f35a4bfe13
parentdda01cea55fefd450b3de5e8bacb99f264b62486 (diff)
downloadsamba-826661597ea603e35b4dcbd8e2a71e2900dccd7a.tar.gz
samba-826661597ea603e35b4dcbd8e2a71e2900dccd7a.tar.bz2
samba-826661597ea603e35b4dcbd8e2a71e2900dccd7a.zip
don't check return fields (like search count) on an expected failure
(This used to be commit 6cbe8a6bd5998c67b74b989d13d3cb7863fee75d)
-rw-r--r--source4/torture/nbench/nbio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 4ce3ea011b..b2058249bd 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -236,7 +236,7 @@ void nb_writex(int handle, int offset, int size, int ret_size, NTSTATUS status)
check_status("WriteX", status, ret);
- if (io.writex.out.nwritten != ret_size) {
+ if (NT_STATUS_IS_OK(ret) && io.writex.out.nwritten != ret_size) {
printf("[%d] Warning: WriteX got count %d expected %d\n",
nbench_line_count,
io.writex.out.nwritten, ret_size);
@@ -274,7 +274,7 @@ void nb_write(int handle, int offset, int size, int ret_size, NTSTATUS status)
check_status("Write", status, ret);
- if (io.write.out.nwritten != ret_size) {
+ if (NT_STATUS_IS_OK(ret) && io.write.out.nwritten != ret_size) {
printf("[%d] Warning: Write got count %d expected %d\n",
nbench_line_count,
io.write.out.nwritten, ret_size);
@@ -363,7 +363,7 @@ void nb_readx(int handle, int offset, int size, int ret_size, NTSTATUS status)
check_status("ReadX", status, ret);
- if (io.readx.out.nread != ret_size) {
+ if (NT_STATUS_IS_OK(ret) && io.readx.out.nread != ret_size) {
printf("[%d] Warning: ReadX got count %d expected %d\n",
nbench_line_count,
io.readx.out.nread, ret_size);
@@ -532,7 +532,7 @@ void nb_findfirst(const char *mask, int level, int maxcnt, int count, NTSTATUS s
check_status("Search", status, ret);
- if (io.t2ffirst.out.count != count) {
+ if (NT_STATUS_IS_OK(ret) && io.t2ffirst.out.count != count) {
printf("[%d] Warning: got count %d expected %d\n",
nbench_line_count,
io.t2ffirst.out.count, count);