From c8a5f304c6de43b5f0d56dbff315ac193bb12f9b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 21 Dec 2006 02:48:46 +0000
Subject: r20299: Disable two new tests that are apparently broken. (This used
 to be commit b3f64869fc4590850203a231ecf6810ae9f1d8cf)

---
 source4/pidl/tests/Util.pm        |  4 ++--
 source4/pidl/tests/ndr_fullptr.pl |  4 ++++
 source4/pidl/tests/ndr_string.pl  | 10 +++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm
index cbe6283852..d8ae30f3c3 100644
--- a/source4/pidl/tests/Util.pm
+++ b/source4/pidl/tests/Util.pm
@@ -43,7 +43,7 @@ SKIP: {
 	if (defined($test_data_prefix)) {
 		$outfile = "$test_data_prefix/test-$name";	
 	} else {
-		$outfile = "test-$name";
+		$outfile = "./test-$name";
 	}
 
 	my $flags = `pkg-config --libs --cflags ndr samba-config`;
@@ -74,7 +74,7 @@ SKIP: {
 
 	ok(-f $outfile, "($name) compile");
 
-	my $ret = system("./$outfile", ()) >> 8;
+	my $ret = system($outfile, ()) >> 8;
 	print "# return code: $ret\n" if ($ret != 0);
 
 	ok($ret == 0, "($name) run");
diff --git a/source4/pidl/tests/ndr_fullptr.pl b/source4/pidl/tests/ndr_fullptr.pl
index 569f0060a3..dabbc6f5b6 100755
--- a/source4/pidl/tests/ndr_fullptr.pl
+++ b/source4/pidl/tests/ndr_fullptr.pl
@@ -10,6 +10,9 @@ use lib "$RealBin/../lib";
 use lib "$RealBin";
 use Util qw(test_samba4_ndr);
 
+SKIP: {
+	skip "full pointers not supported yet", 8;
+
 test_samba4_ndr("fullptr-push-dup", 
 '	
 	[public] uint16 echo_TestFull([in,ptr] uint32 *x, [in,ptr] uint32 *y);
@@ -39,3 +42,4 @@ test_samba4_ndr("fullptr-push-dup",
 		return 3;
 	}
 ');
+}
diff --git a/source4/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
index 9a09261996..dd6afde2b2 100755
--- a/source4/pidl/tests/ndr_string.pl
+++ b/source4/pidl/tests/ndr_string.pl
@@ -54,9 +54,12 @@ test_samba4_ndr("string-ascii-pull",
 		return 4;
 ');
 
+SKIP: {
+	skip "doesn't seem to work yet", 8;
+
 test_samba4_ndr("string-out", 
 '
-	[public] void TestString([out,string] uint8 **data);
+	[public] void TestString([out,string,charset(UNIX)] uint8 **data);
 ',
 '
 	uint8_t data[] = { 0x03, 0x00, 0x00, 0x00, 
@@ -77,8 +80,9 @@ test_samba4_ndr("string-out",
 		return 3;
 
 	if (strncmp(r.out.data, "foo", 3) != 0)
-		return 3;
+		return 4;
 
 	if (r.out.data[4] != 0)
-		return 4;
+		return 5;
 ');
+}
-- 
cgit