From b78ebdbfc037a7ffe400edbd08bce7f03968405a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 12 Jun 2006 19:49:53 +0000
Subject: r16165: Add some more helper utilities (This used to be commit
 584cd50d2bbace27220427ab23d032b2aab7f047)

---
 source4/torture/ui.c |  5 +++++
 source4/torture/ui.h | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index 35ff3cee7d..9c25991d20 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -79,6 +79,11 @@ void torture_fail(struct torture_test *test, const char *fmt, ...) _PRINTF_ATTRI
 	test->context->failed++;
 }
 
+BOOL torture_result(struct torture_context *torture)
+{
+	return (torture->failed == 0);
+}
+
 void torture_skip(struct torture_test *test, const char *fmt, ...) _PRINTF_ATTRIBUTE(2,3)
 {
 	va_list ap;
diff --git a/source4/torture/ui.h b/source4/torture/ui.h
index 04760d6285..8bc309d717 100644
--- a/source4/torture/ui.h
+++ b/source4/torture/ui.h
@@ -78,6 +78,21 @@ struct torture_context
 		return False; \
 	}
 
+#define torture_assert_casestr_equal(ctx,got,expected,string) \
+	if (strcasecmp(got, expected) != 0) { \
+		torture_fail(ctx, "%s:%d (%s): got %s, expected %s", __FILE__, \
+					 __LINE__, string, got, expected); \
+		return False; \
+	}
+
+#define torture_assert_str_equal(ctx,got,expected,string) \
+	if (strcmp(got, expected) != 0) { \
+		torture_fail(ctx, "%s:%d (%s): got %s, expected %s", __FILE__, \
+					 __LINE__, string, got, expected); \
+		return False; \
+	}
+
+
 /* Convenience macros */
 
 #define torture_assert_ntstatus_ok(ctx,expr,string) \
@@ -92,3 +107,4 @@ void torture_comment(struct torture_test *test, const char *comment, ...) _PRINT
 void torture_ok(struct torture_test *test);
 void torture_fail(struct torture_test *test, const char *reason, ...) _PRINTF_ATTRIBUTE(2,3);
 void torture_skip(struct torture_test *test, const char *reason, ...) _PRINTF_ATTRIBUTE(2,3);
+BOOL torture_result(struct torture_context *torture);
-- 
cgit