From 717beda638e84902ef9b78eb37e0d8e85672ffd3 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 17 Mar 2011 12:25:25 +0100
Subject: s4-smbtorture: more torture_fail usage in raw.write test.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Mar 17 13:10:14 CET 2011 on sn-devel-104
---
 source4/torture/raw/write.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/torture/raw')

diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index d3d21c58a7..8e564d7563 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -27,16 +27,16 @@
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
-		torture_comment(tctx, "(%s) Incorrect status %s - should be %s\n", \
-		       __location__, nt_errstr(status), nt_errstr(correct)); \
+		torture_fail(tctx, talloc_asprintf(tctx, "(%s) Incorrect status %s - should be %s\n", \
+		       __location__, nt_errstr(status), nt_errstr(correct))); \
 		ret = false; \
 		goto done; \
 	}} while (0)
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
-		torture_comment(tctx, "(%s) Incorrect value %s=%d - should be %d\n", \
-		       __location__, #v, v, correct); \
+		torture_fail(tctx, talloc_asprintf(tctx, "(%s) Incorrect value %s=%d - should be %d\n", \
+		       __location__, #v, v, correct)); \
 		ret = false; \
 		goto done; \
 	}} while (0)
@@ -84,8 +84,8 @@ static bool check_buffer(struct torture_context *tctx,
 	for (i=0;i<len;i++) {
 		uint8_t v = random();
 		if (buf[i] != v) {
-			torture_comment(tctx, "Buffer incorrect at %s! ofs=%d buf=0x%x correct=0x%x\n",
-			       location, i, buf[i], v);
+			torture_fail(tctx, talloc_asprintf(tctx, "Buffer incorrect at %s! ofs=%d buf=0x%x correct=0x%x\n",
+			       location, i, buf[i], v));
 			return false;
 		}
 	}
-- 
cgit