From 35c067782b1dcd354dd825af3e853adf4c74e1d1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 8 Dec 2009 10:21:28 +0100 Subject: s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test. Guenther --- source4/torture/rpc/spoolss.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'source4/torture/rpc/spoolss.c') diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 26083a7a20..1a2c6ddea4 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -80,7 +80,21 @@ struct test_spoolss_context { torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \ } while(0) -#define COMPARE_STRING_ARRAY(tctx, c,r,e) +#define COMPARE_STRING_ARRAY(tctx, c,r,e) do {\ + int __i; \ + if (!c.e && !r.e) { \ + break; \ + } \ + if (c.e && !r.e) { \ + torture_fail(tctx, #r "." #e " field is NULL and " #c "." #e " is not\n"); \ + } \ + if (!c.e && r.e) { \ + torture_fail(tctx, #c "." #e " field is NULL and " #r "." #e " is not\n"); \ + } \ + for (__i=0;c.e[__i] != NULL; __i++) { \ + torture_assert_str_equal(tctx, c.e[__i], r.e[__i], "invalid value"); \ + } \ +} while(0) static bool test_OpenPrinter_server(struct torture_context *tctx, struct dcerpc_pipe *p, -- cgit