wafsamba: Cope with slight differences in gdb output regarding incomplete sequences.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8820

diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 990e1e5fdfe923bf25608320f053ee3f0e6e4266..76c2d8b0d41e23e4dc8deabc373417176ce967cd 100644 (file)
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -18,6 +18,7 @@ def normalise_signature(sig):
     sig = re.sub('^\$[0-9]+\s=\s\{*', '', sig)
     sig = re.sub('\}(\s0x[0-9a-f]+\s<\w+>)?$', '', sig)
     sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig)
+    sig = re.sub('", <incomplete sequence (\\\\[a-z0-9]+)>', r'\1"', sig)
 
     for t in abi_type_maps:
         # we need to cope with non-word characters in mapped types
@@ -30,11 +31,13 @@ def normalise_signature(sig):
         sig = re.sub(m, abi_type_maps[t], sig)
     return sig
 
+
 def normalise_varargs(sig):
     '''cope with older versions of gdb'''
     sig = re.sub(',\s\.\.\.', '', sig)
     return sig
 
+
 def parse_sigs(sigs, abi_match):
     '''parse ABI signatures file'''
     abi_match = samba_utils.TO_LIST(abi_match)
@@ -54,6 +57,7 @@ def parse_sigs(sigs, abi_match):
                     break
             if not matched:
                 continue
+        print "%s -> %s" % (sa[1], normalise_signature(sa[1]))
         ret[sa[0]] = normalise_signature(sa[1])
     return ret
 

diff --git a/buildtools/wafsamba/tests/__init__.py b/buildtools/wafsamba/tests/__init__.py
index 76788802ab49189e92acc21f4e5ec6f13a81c293..c9f2fb64d7977f26dcd03d9c4aecfc9a88d1f0fa 100644 (file)
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -23,6 +23,7 @@ from unittest import (
 
 def test_suite():
     names = [
+        'abi',
         'utils',
         ]
     module_names = ['wafsamba.tests.test_' + name for name in names]

diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
new file mode 100644 (file)
index 0000000..0aa0d56
--- /dev/null
+++ b/buildtools/wafsamba/tests/test_abi.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2012 Jelmer Vernooij <jelmer@samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from wafsamba.tests import TestCase
+
+from wafsamba.samba_abi import (
+    normalise_signature,
+    )
+
+
+class NormaliseSignatureTests(TestCase):
+
+    def test_function_simple(self):
+        self.assertEquals("int (const struct GUID *, const struct GUID *)",
+            normalise_signature("$2 = {int (const struct GUID *, const struct GUID *)} 0xe871 <GUID_compare>"))
+
+    def test_maps_Bool(self):
+        # Some types have different internal names
+        self.assertEquals("bool (const struct GUID *)",
+            normalise_signature("$1 = {_Bool (const struct GUID *)} 0xe75b <GUID_all_zero>"))
+
+    def test_function_keep(self):
+        self.assertEquals(
+            "enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)",
+            normalise_signature("enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)"))
+
+    def test_struct_constant(self):
+        self.assertEquals(
+            'uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\\000", node = "\\000\\000\\000\\000\\000"}, if_version = 0',
+            normalise_signature('$239 = {uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\\000", node = "\\000\\000\\000\\000\\000"}, if_version = 0}'))
+
+    def test_incomplete_sequence(self):
+        # Newer versions of gdb insert these incomplete sequence elements
+        self.assertEquals(
+            'uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2',
+            normalise_signature('$244 = {uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237", <incomplete sequence \\350>, node = "\\b\\000+\\020H`"}, if_version = 2}'))
+        self.assertEquals(
+            'uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2',
+            normalise_signature('$244 = {uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\\237\\350", node = "\\b\\000+\\020H`"}, if_version = 2}'))
+

diff --git a/librpc/ABI/ndr-0.0.1.sigs b/librpc/ABI/ndr-0.0.1.sigs
index ae507c8ab8684750196aa3b8bec2b86e16ca1af0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/librpc/ABI/ndr-0.0.1.sigs
+++ b/librpc/ABI/ndr-0.0.1.sigs
@@ -1,245 +0,0 @@
-GUID_all_zero: bool (const struct GUID *)
-GUID_compare: int (const struct GUID *, const struct GUID *)
-GUID_equal: bool (const struct GUID *, const struct GUID *)
-GUID_from_data_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
-GUID_from_ndr_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
-GUID_from_string: NTSTATUS (const char *, struct GUID *)
-GUID_hexstring: char *(TALLOC_CTX *, const struct GUID *)
-GUID_random: struct GUID (void)
-GUID_string: char *(TALLOC_CTX *, const struct GUID *)
-GUID_string2: char *(TALLOC_CTX *, const struct GUID *)
-GUID_to_ndr_blob: NTSTATUS (const struct GUID *, TALLOC_CTX *, DATA_BLOB *)
-GUID_zero: struct GUID (void)
-ndr_align_size: size_t (uint32_t, size_t)
-ndr_charset_length: uint32_t (const void *, charset_t)
-ndr_check_array_length: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
-ndr_check_array_size: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
-ndr_check_padding: void (struct ndr_pull *, size_t)
-ndr_check_pipe_chunk_trailer: enum ndr_err_code (struct ndr_pull *, int, uint32_t)
-ndr_check_string_terminator: enum ndr_err_code (struct ndr_pull *, uint32_t, uint32_t)
-ndr_get_array_length: uint32_t (struct ndr_pull *, const void *)
-ndr_get_array_size: uint32_t (struct ndr_pull *, const void *)
-ndr_map_error2errno: int (enum ndr_err_code)
-ndr_map_error2ntstatus: NTSTATUS (enum ndr_err_code)
-ndr_map_error2string: const char *(enum ndr_err_code)
-ndr_policy_handle_empty: bool (const struct policy_handle *)
-ndr_policy_handle_equal: bool (const struct policy_handle *, const struct policy_handle *)
-ndr_print_DATA_BLOB: void (struct ndr_print *, const char *, DATA_BLOB)
-ndr_print_GUID: void (struct ndr_print *, const char *, const struct GUID *)
-ndr_print_KRB5_EDATA_NTSTATUS: void (struct ndr_print *, const char *, const struct KRB5_EDATA_NTSTATUS *)
-ndr_print_NTSTATUS: void (struct ndr_print *, const char *, NTSTATUS)
-ndr_print_NTTIME: void (struct ndr_print *, const char *, NTTIME)
-ndr_print_NTTIME_1sec: void (struct ndr_print *, const char *, NTTIME)
-ndr_print_NTTIME_hyper: void (struct ndr_print *, const char *, NTTIME)
-ndr_print_WERROR: void (struct ndr_print *, const char *, WERROR)
-ndr_print_array_uint8: void (struct ndr_print *, const char *, const uint8_t *, uint32_t)
-ndr_print_bad_level: void (struct ndr_print *, const char *, uint16_t)
-ndr_print_bitmap_flag: void (struct ndr_print *, size_t, const char *, uint32_t, uint32_t)
-ndr_print_bool: void (struct ndr_print *, const char *, const bool)
-ndr_print_debug: void (ndr_print_fn_t, const char *, void *)
-ndr_print_debug_helper: void (struct ndr_print *, const char *, ...)
-ndr_print_dlong: void (struct ndr_print *, const char *, int64_t)
-ndr_print_double: void (struct ndr_print *, const char *, double)
-ndr_print_enum: void (struct ndr_print *, const char *, const char *, const char *, uint32_t)
-ndr_print_function_debug: void (ndr_print_function_t, const char *, int, void *)
-ndr_print_function_string: char *(TALLOC_CTX *, ndr_print_function_t, const char *, int, void *)
-ndr_print_get_switch_value: uint32_t (struct ndr_print *, const void *)
-ndr_print_gid_t: void (struct ndr_print *, const char *, gid_t)
-ndr_print_hyper: void (struct ndr_print *, const char *, uint64_t)
-ndr_print_int16: void (struct ndr_print *, const char *, int16_t)
-ndr_print_int32: void (struct ndr_print *, const char *, int32_t)
-ndr_print_int3264: void (struct ndr_print *, const char *, int32_t)
-ndr_print_int8: void (struct ndr_print *, const char *, int8_t)
-ndr_print_ipv4address: void (struct ndr_print *, const char *, const char *)
-ndr_print_ipv6address: void (struct ndr_print *, const char *, const char *)
-ndr_print_ndr_syntax_id: void (struct ndr_print *, const char *, const struct ndr_syntax_id *)
-ndr_print_netr_SamDatabaseID: void (struct ndr_print *, const char *, enum netr_SamDatabaseID)
-ndr_print_netr_SchannelType: void (struct ndr_print *, const char *, enum netr_SchannelType)
-ndr_print_null: void (struct ndr_print *)
-ndr_print_pointer: void (struct ndr_print *, const char *, void *)
-ndr_print_policy_handle: void (struct ndr_print *, const char *, const struct policy_handle *)
-ndr_print_printf_helper: void (struct ndr_print *, const char *, ...)
-ndr_print_ptr: void (struct ndr_print *, const char *, const void *)
-ndr_print_set_switch_value: enum ndr_err_code (struct ndr_print *, const void *, uint32_t)
-ndr_print_sockaddr_storage: void (struct ndr_print *, const char *, const struct sockaddr_storage *)
-ndr_print_string: void (struct ndr_print *, const char *, const char *)
-ndr_print_string_array: void (struct ndr_print *, const char *, const char **)
-ndr_print_string_helper: void (struct ndr_print *, const char *, ...)
-ndr_print_struct: void (struct ndr_print *, const char *, const char *)
-ndr_print_struct_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, void *)
-ndr_print_svcctl_ServerType: void (struct ndr_print *, const char *, uint32_t)
-ndr_print_time_t: void (struct ndr_print *, const char *, time_t)
-ndr_print_timespec: void (struct ndr_print *, const char *, const struct timespec *)
-ndr_print_timeval: void (struct ndr_print *, const char *, const struct timeval *)
-ndr_print_udlong: void (struct ndr_print *, const char *, uint64_t)
-ndr_print_udlongr: void (struct ndr_print *, const char *, uint64_t)
-ndr_print_uid_t: void (struct ndr_print *, const char *, uid_t)
-ndr_print_uint16: void (struct ndr_print *, const char *, uint16_t)
-ndr_print_uint32: void (struct ndr_print *, const char *, uint32_t)
-ndr_print_uint3264: void (struct ndr_print *, const char *, uint32_t)
-ndr_print_uint8: void (struct ndr_print *, const char *, uint8_t)
-ndr_print_union: void (struct ndr_print *, const char *, int, const char *)
-ndr_print_union_debug: void (ndr_print_fn_t, const char *, uint32_t, void *)
-ndr_print_union_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, uint32_t, void *)
-ndr_print_winreg_Data: void (struct ndr_print *, const char *, const union winreg_Data *)
-ndr_print_winreg_Type: void (struct ndr_print *, const char *, enum winreg_Type)
-ndr_pull_DATA_BLOB: enum ndr_err_code (struct ndr_pull *, int, DATA_BLOB *)
-ndr_pull_GUID: enum ndr_err_code (struct ndr_pull *, int, struct GUID *)
-ndr_pull_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, struct KRB5_EDATA_NTSTATUS *)
-ndr_pull_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, NTSTATUS *)
-ndr_pull_NTTIME: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
-ndr_pull_NTTIME_1sec: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
-ndr_pull_NTTIME_hyper: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
-ndr_pull_WERROR: enum ndr_err_code (struct ndr_pull *, int, WERROR *)
-ndr_pull_advance: enum ndr_err_code (struct ndr_pull *, uint32_t)
-ndr_pull_align: enum ndr_err_code (struct ndr_pull *, size_t)
-ndr_pull_array_length: enum ndr_err_code (struct ndr_pull *, const void *)
-ndr_pull_array_size: enum ndr_err_code (struct ndr_pull *, const void *)
-ndr_pull_array_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *, uint32_t)
-ndr_pull_bytes: enum ndr_err_code (struct ndr_pull *, uint8_t *, uint32_t)
-ndr_pull_charset: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
-ndr_pull_charset_to_null: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
-ndr_pull_dlong: enum ndr_err_code (struct ndr_pull *, int, int64_t *)
-ndr_pull_double: enum ndr_err_code (struct ndr_pull *, int, double *)
-ndr_pull_enum_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
-ndr_pull_enum_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
-ndr_pull_enum_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
-ndr_pull_enum_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
-ndr_pull_error: enum ndr_err_code (struct ndr_pull *, enum ndr_err_code, const char *, ...)
-ndr_pull_generic_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
-ndr_pull_get_relative_base_offset: uint32_t (struct ndr_pull *)
-ndr_pull_get_switch_value: uint32_t (struct ndr_pull *, const void *)
-ndr_pull_gid_t: enum ndr_err_code (struct ndr_pull *, int, gid_t *)
-ndr_pull_hyper: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
-ndr_pull_init_blob: struct ndr_pull *(const DATA_BLOB *, TALLOC_CTX *)
-ndr_pull_int16: enum ndr_err_code (struct ndr_pull *, int, int16_t *)
-ndr_pull_int32: enum ndr_err_code (struct ndr_pull *, int, int32_t *)
-ndr_pull_int8: enum ndr_err_code (struct ndr_pull *, int, int8_t *)
-ndr_pull_ipv4address: enum ndr_err_code (struct ndr_pull *, int, const char **)
-ndr_pull_ipv6address: enum ndr_err_code (struct ndr_pull *, int, const char **)
-ndr_pull_ndr_syntax_id: enum ndr_err_code (struct ndr_pull *, int, struct ndr_syntax_id *)
-ndr_pull_netr_SamDatabaseID: enum ndr_err_code (struct ndr_pull *, int, enum netr_SamDatabaseID *)
-ndr_pull_netr_SchannelType: enum ndr_err_code (struct ndr_pull *, int, enum netr_SchannelType *)
-ndr_pull_pointer: enum ndr_err_code (struct ndr_pull *, int, void **)
-ndr_pull_policy_handle: enum ndr_err_code (struct ndr_pull *, int, struct policy_handle *)
-ndr_pull_ref_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
-ndr_pull_relative_ptr1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
-ndr_pull_relative_ptr2: enum ndr_err_code (struct ndr_pull *, const void *)
-ndr_pull_relative_ptr_short: enum ndr_err_code (struct ndr_pull *, uint16_t *)
-ndr_pull_restore_relative_base_offset: void (struct ndr_pull *, uint32_t)
-ndr_pull_set_switch_value: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
-ndr_pull_setup_relative_base_offset1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
-ndr_pull_setup_relative_base_offset2: enum ndr_err_code (struct ndr_pull *, const void *)
-ndr_pull_string: enum ndr_err_code (struct ndr_pull *, int, const char **)
-ndr_pull_string_array: enum ndr_err_code (struct ndr_pull *, int, const char ***)
-ndr_pull_struct_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
-ndr_pull_struct_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
-ndr_pull_subcontext_end: enum ndr_err_code (struct ndr_pull *, struct ndr_pull *, size_t, ssize_t)
-ndr_pull_subcontext_start: enum ndr_err_code (struct ndr_pull *, struct ndr_pull **, size_t, ssize_t)
-ndr_pull_svcctl_ServerType: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
-ndr_pull_time_t: enum ndr_err_code (struct ndr_pull *, int, time_t *)
-ndr_pull_timespec: enum ndr_err_code (struct ndr_pull *, int, struct timespec *)
-ndr_pull_timeval: enum ndr_err_code (struct ndr_pull *, int, struct timeval *)
-ndr_pull_trailer_align: enum ndr_err_code (struct ndr_pull *, size_t)
-ndr_pull_udlong: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
-ndr_pull_udlongr: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
-ndr_pull_uid_t: enum ndr_err_code (struct ndr_pull *, int, uid_t *)
-ndr_pull_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
-ndr_pull_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
-ndr_pull_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
-ndr_pull_uint3264: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
-ndr_pull_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
-ndr_pull_union_align: enum ndr_err_code (struct ndr_pull *, size_t)
-ndr_pull_union_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
-ndr_pull_union_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
-ndr_pull_winreg_Data: enum ndr_err_code (struct ndr_pull *, int, union winreg_Data *)
-ndr_pull_winreg_Type: enum ndr_err_code (struct ndr_pull *, int, enum winreg_Type *)
-ndr_push_DATA_BLOB: enum ndr_err_code (struct ndr_push *, int, DATA_BLOB)
-ndr_push_GUID: enum ndr_err_code (struct ndr_push *, int, const struct GUID *)
-ndr_push_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, const struct KRB5_EDATA_NTSTATUS *)
-ndr_push_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, NTSTATUS)
-ndr_push_NTTIME: enum ndr_err_code (struct ndr_push *, int, NTTIME)
-ndr_push_NTTIME_1sec: enum ndr_err_code (struct ndr_push *, int, NTTIME)
-ndr_push_NTTIME_hyper: enum ndr_err_code (struct ndr_push *, int, NTTIME)
-ndr_push_WERROR: enum ndr_err_code (struct ndr_push *, int, WERROR)
-ndr_push_align: enum ndr_err_code (struct ndr_push *, size_t)
-ndr_push_array_uint8: enum ndr_err_code (struct ndr_push *, int, const uint8_t *, uint32_t)
-ndr_push_blob: DATA_BLOB (struct ndr_push *)
-ndr_push_bytes: enum ndr_err_code (struct ndr_push *, const uint8_t *, uint32_t)
-ndr_push_charset: enum ndr_err_code (struct ndr_push *, int, const char *, uint32_t, uint8_t, charset_t)
-ndr_push_dlong: enum ndr_err_code (struct ndr_push *, int, int64_t)
-ndr_push_double: enum ndr_err_code (struct ndr_push *, int, double)
-ndr_push_enum_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
-ndr_push_enum_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
-ndr_push_enum_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
-ndr_push_enum_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
-ndr_push_error: enum ndr_err_code (struct ndr_push *, enum ndr_err_code, const char *, ...)
-ndr_push_expand: enum ndr_err_code (struct ndr_push *, uint32_t)
-ndr_push_full_ptr: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_get_relative_base_offset: uint32_t (struct ndr_push *)
-ndr_push_get_switch_value: uint32_t (struct ndr_push *, const void *)
-ndr_push_gid_t: enum ndr_err_code (struct ndr_push *, int, gid_t)
-ndr_push_hyper: enum ndr_err_code (struct ndr_push *, int, uint64_t)
-ndr_push_init_ctx: struct ndr_push *(TALLOC_CTX *)
-ndr_push_int16: enum ndr_err_code (struct ndr_push *, int, int16_t)
-ndr_push_int32: enum ndr_err_code (struct ndr_push *, int, int32_t)
-ndr_push_int8: enum ndr_err_code (struct ndr_push *, int, int8_t)
-ndr_push_ipv4address: enum ndr_err_code (struct ndr_push *, int, const char *)
-ndr_push_ipv6address: enum ndr_err_code (struct ndr_push *, int, const char *)
-ndr_push_ndr_syntax_id: enum ndr_err_code (struct ndr_push *, int, const struct ndr_syntax_id *)
-ndr_push_netr_SamDatabaseID: enum ndr_err_code (struct ndr_push *, int, enum netr_SamDatabaseID)
-ndr_push_netr_SchannelType: enum ndr_err_code (struct ndr_push *, int, enum netr_SchannelType)
-ndr_push_pipe_chunk_trailer: enum ndr_err_code (struct ndr_push *, int, uint32_t)
-ndr_push_pointer: enum ndr_err_code (struct ndr_push *, int, void *)
-ndr_push_policy_handle: enum ndr_err_code (struct ndr_push *, int, const struct policy_handle *)
-ndr_push_ref_ptr: enum ndr_err_code (struct ndr_push *)
-ndr_push_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_relative_ptr2_end: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_relative_ptr2_start: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_restore_relative_base_offset: void (struct ndr_push *, uint32_t)
-ndr_push_set_switch_value: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
-ndr_push_setup_relative_base_offset1: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
-ndr_push_setup_relative_base_offset2: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_short_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_short_relative_ptr2: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_string: enum ndr_err_code (struct ndr_push *, int, const char *)
-ndr_push_string_array: enum ndr_err_code (struct ndr_push *, int, const char **)
-ndr_push_struct_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, const void *, ndr_push_flags_fn_t)
-ndr_push_subcontext_end: enum ndr_err_code (struct ndr_push *, struct ndr_push *, size_t, ssize_t)
-ndr_push_subcontext_start: enum ndr_err_code (struct ndr_push *, struct ndr_push **, size_t, ssize_t)
-ndr_push_svcctl_ServerType: enum ndr_err_code (struct ndr_push *, int, uint32_t)
-ndr_push_time_t: enum ndr_err_code (struct ndr_push *, int, time_t)
-ndr_push_timespec: enum ndr_err_code (struct ndr_push *, int, const struct timespec *)
-ndr_push_timeval: enum ndr_err_code (struct ndr_push *, int, const struct timeval *)
-ndr_push_trailer_align: enum ndr_err_code (struct ndr_push *, size_t)
-ndr_push_udlong: enum ndr_err_code (struct ndr_push *, int, uint64_t)
-ndr_push_udlongr: enum ndr_err_code (struct ndr_push *, int, uint64_t)
-ndr_push_uid_t: enum ndr_err_code (struct ndr_push *, int, uid_t)
-ndr_push_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
-ndr_push_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
-ndr_push_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
-ndr_push_uint3264: enum ndr_err_code (struct ndr_push *, int, uint32_t)
-ndr_push_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
-ndr_push_union_align: enum ndr_err_code (struct ndr_push *, size_t)
-ndr_push_union_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_push_flags_fn_t)
-ndr_push_unique_ptr: enum ndr_err_code (struct ndr_push *, const void *)
-ndr_push_winreg_Data: enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)
-ndr_push_winreg_Type: enum ndr_err_code (struct ndr_push *, int, enum winreg_Type)
-ndr_push_zero: enum ndr_err_code (struct ndr_push *, uint32_t)
-ndr_set_flags: void (uint32_t *, uint32_t)
-ndr_size_DATA_BLOB: uint32_t (int, const DATA_BLOB *, int)
-ndr_size_GUID: size_t (const struct GUID *, int)
-ndr_size_string: uint32_t (int, const char * const *, int)
-ndr_size_string_array: size_t (const char **, uint32_t, int)
-ndr_size_struct: size_t (const void *, int, ndr_push_flags_fn_t)
-ndr_size_union: size_t (const void *, int, uint32_t, ndr_push_flags_fn_t)
-ndr_string_array_size: size_t (struct ndr_push *, const char *)
-ndr_string_length: uint32_t (const void *, uint32_t)
-ndr_syntax_id_equal: bool (const struct ndr_syntax_id *, const struct ndr_syntax_id *)
-ndr_syntax_id_null: uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\000", node = "\000\000\000\000\000"}, if_version = 0
-ndr_token_peek: uint32_t (struct ndr_token_list **, const void *)
-ndr_token_retrieve: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *)
-ndr_token_retrieve_cmp_fn: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *, comparison_fn_t, bool)
-ndr_token_store: enum ndr_err_code (TALLOC_CTX *, struct ndr_token_list **, const void *, uint32_t)
-ndr_transfer_syntax_ndr: uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\237", <incomplete sequence \350>, node = "\b\000+\020H`"}, if_version = 2
-ndr_transfer_syntax_ndr64: uuid = {time_low = 1903232307, time_mid = 48826, time_hi_and_version = 18743, clock_seq = "\203\031", node = "\265\333\357\234\314\066"}, if_version = 1

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 63d1b80ef212905b7364ea96214c2f9003df3c9d..f08417454a4e0a5285f28a15fbc42091b75dcfc5 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -437,7 +437,7 @@ planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
 
 planpythontestsuite("none", "subunit")
 planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
-planpythontestsuite("none", "wafsamba.tests.test_utils", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
+planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
 planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])
 planoldpythontestsuite("dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
 planoldpythontestsuite("plugin_s4_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])