From acd63fdb86769ff4328ccb6a4096181e65e4d30f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 20 Mar 2012 02:31:02 +0100
Subject: wafsamba: Cope with slight differences in gdb output regarding
 incomplete sequences.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=8820
---
 buildtools/wafsamba/samba_abi.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'buildtools/wafsamba/samba_abi.py')

diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 990e1e5fdf..76c2d8b0d4 100644
--- 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
 
-- 
cgit