r20299: Disable two new tests that are apparently broken.

(This used to be commit b3f64869fc4590850203a231ecf6810ae9f1d8cf)

diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm
index cbe6283852b27ec6c3e6cd32202b144c0f7315ae..d8ae30f3c3cc1de19485fd94a2594e95dcc96109 100644 (file)
--- 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 569f0060a33b92c672df4f8319c227cbb0c0e163..dabbc6f5b64ef670d95a5b0131edafbfadb236e4 100755 (executable)
--- 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 9a09261996d86d6f366a3c87ea70dc812ea314f3..dd6afde2b26a7ebfba9df575b0eff9ecc234afe1 100755 (executable)
--- 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;
 ');
+}