r21386: Run all NDR tests in the buildfarm, import some functions from Samba3's IDL.

(This used to be commit 15a4b81ba0b5eeb25126a0b1a7bea7d3bf921ab2)

3 files changed, 3 insertions, 213 deletions

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index be06e0141e..1397e8600a 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -25,7 +25,6 @@ OBJ_FILES = \
 		util_strlist.o \
 		util_file.o \
 		sddl.o \
-		ndr.o \
 		tdr.o \
 		event.o \
 		local.o \
@@ -42,6 +41,7 @@ PUBLIC_DEPENDENCIES = \
 		POPT_CREDENTIALS \
 		TORTURE_AUTH \
 		TORTURE_UTIL
+PRIVATE_DEPENDENCIES = TORTURE_NDR
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 8c050ddd14..c210783028 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "torture/local/proto.h"
+#include "torture/ndr/ndr.h"
+#include "torture/ndr/proto.h"
 #include "torture/auth/proto.h"
 
 /* ignore me */ static struct torture_suite *
diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c
deleted file mode 100644
index 395fba1905..0000000000
--- a/source4/torture/local/ndr.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   test suite for basic ndr functions
-
-   Copyright (C) Jelmer Vernooij 2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "torture/torture.h"
-#include "librpc/ndr/libndr.h"
-
-static bool test_check_string_terminator(struct torture_context *tctx)
-{
-	struct ndr_pull *ndr;
-	DATA_BLOB blob;
-	TALLOC_CTX *mem_ctx = tctx;
-
-	/* Simple test */
-	blob = strhex_to_data_blob("0000");
-	
-	ndr = ndr_pull_init_blob(&blob, mem_ctx);
-
-	torture_assert_ntstatus_ok(tctx, ndr_check_string_terminator(ndr, 1, 2),
-							   "simple check_string_terminator test failed");
-
-	torture_assert(tctx, ndr->offset == 0,
-		"check_string_terminator did not reset offset");
-
-	if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 1, 3))) {
-		torture_fail(tctx, "check_string_terminator checked beyond string boundaries");
-	}
-
-	torture_assert(tctx, ndr->offset == 0, 
-		"check_string_terminator did not reset offset");
-
-	talloc_free(ndr);
-
-	blob = strhex_to_data_blob("11220000");
-	ndr = ndr_pull_init_blob(&blob, mem_ctx);
-
-	torture_assert_ntstatus_ok(tctx, 
-		ndr_check_string_terminator(ndr, 4, 1),
-		"check_string_terminator failed to recognize terminator");
-
-	torture_assert_ntstatus_ok(tctx, 
-		ndr_check_string_terminator(ndr, 3, 1),
-		"check_string_terminator failed to recognize terminator");
-
-	if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 2, 1))) {
-		torture_fail(tctx, 
-					 "check_string_terminator erroneously reported terminator");
-	}
-
-	torture_assert(tctx, ndr->offset == 0,
-		"check_string_terminator did not reset offset");
-	return true;
-}
-
-static bool test_guid_from_string_valid(struct torture_context *tctx)
-{
-	/* FIXME */
-	return true;
-}
-
-static bool test_guid_from_string_null(struct torture_context *tctx)
-{
-	struct GUID guid;
-	torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
-								  GUID_from_string(NULL, &guid), 
-								  "NULL failed");
-	return true;
-}
-
-static bool test_guid_from_string_invalid(struct torture_context *tctx)
-{
-	struct GUID g1;
-	torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER, 
-								  GUID_from_string("bla", &g1),
-								  "parameter not invalid");
-	return true;
-}	
-
-static bool test_guid_from_string(struct torture_context *tctx)
-{
-	struct GUID g1, exp;
-	torture_assert_ntstatus_ok(tctx,
-							   GUID_from_string("00000001-0002-0003-0405-060708090a0b", &g1),
-							   "invalid return code");
-	exp.time_low = 1;
-	exp.time_mid = 2;
-	exp.time_hi_and_version = 3;
-	exp.clock_seq[0] = 4;
-	exp.clock_seq[1] = 5;
-	exp.node[0] = 6;
-	exp.node[1] = 7;
-	exp.node[2] = 8;
-	exp.node[3] = 9;
-	exp.node[4] = 10;
-	exp.node[5] = 11;
-	torture_assert(tctx, GUID_equal(&g1, &exp), "UUID parsed incorrectly");
-	torture_assert_ntstatus_ok(tctx,
-							   GUID_from_string("{00000001-0002-0003-0405-060708090a0b}", &g1),
-							   "invalid return code");
-	torture_assert(tctx, GUID_equal(&g1, &exp), "UUID parsed incorrectly");
-
-	return true;
-}
-
-static bool test_guid_string_valid(struct torture_context *tctx)
-{
-	struct GUID g;
-	g.time_low = 1;
-	g.time_mid = 2;
-	g.time_hi_and_version = 3;
-	g.clock_seq[0] = 4;
-	g.clock_seq[1] = 5;
-	g.node[0] = 6;
-	g.node[1] = 7;
-	g.node[2] = 8;
-	g.node[3] = 9;
-	g.node[4] = 10;
-	g.node[5] = 11;
-	torture_assert_str_equal(tctx, "00000001-0002-0003-0405-060708090a0b", GUID_string(tctx, &g), 
-							 "parsing guid failed");
-	return true;
-}
-
-static bool test_guid_string2_valid(struct torture_context *tctx)
-{
-	struct GUID g;
-	g.time_low = 1;
-	g.time_mid = 2;
-	g.time_hi_and_version = 3;
-	g.clock_seq[0] = 4;
-	g.clock_seq[1] = 5;
-	g.node[0] = 6;
-	g.node[1] = 7;
-	g.node[2] = 8;
-	g.node[3] = 9;
-	g.node[4] = 10;
-	g.node[5] = 11;
-	torture_assert_str_equal(tctx, "{00000001-0002-0003-0405-060708090a0b}", GUID_string2(tctx, &g), 
-							 "parsing guid failed");
-	return true;
-}
-
-static bool test_compare_uuid(struct torture_context *tctx)
-{
-	struct GUID g1, g2;
-	ZERO_STRUCT(g1); ZERO_STRUCT(g2);
-	torture_assert_int_equal(tctx, 0, GUID_compare(&g1, &g2), 
-							 "GUIDs not equal");
-	g1.time_low = 1;
-	torture_assert_int_equal(tctx, 1, GUID_compare(&g1, &g2), 
-							 "GUID diff invalid");
-
-	g1.time_low = 10;
-	torture_assert_int_equal(tctx, 10, GUID_compare(&g1, &g2), 
-							 "GUID diff invalid");
-
-	g1.time_low = 0;
-	g1.clock_seq[1] = 20;
-	torture_assert_int_equal(tctx, 20, GUID_compare(&g1, &g2), 
-							 "GUID diff invalid");
-	return true;
-}
-
-
-struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
-{
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NDR");
-
-	torture_suite_add_simple_test(suite, "string terminator", 
-								   test_check_string_terminator);
-
-	torture_suite_add_simple_test(suite, "guid_from_string_null", 
-								   test_guid_from_string_null);
-
-	torture_suite_add_simple_test(suite, "guid_from_string", 
-								   test_guid_from_string);
-
-	torture_suite_add_simple_test(suite, "guid_from_string_invalid", 
-								   test_guid_from_string_invalid);
-
-	torture_suite_add_simple_test(suite, "guid_string_valid", 
-								   test_guid_string_valid);
-
-	torture_suite_add_simple_test(suite, "guid_string2_valid", 
-								   test_guid_string2_valid);
-
-	torture_suite_add_simple_test(suite, "guid_from_string_valid", 
-								   test_guid_from_string_valid);
-
-	torture_suite_add_simple_test(suite, "compare_uuid", 
-								   test_compare_uuid);
-
-	return suite;
-}