Testsuite fixes for building against 4.9

Author: davidmalcolm

run-test-suite.py

@@ -163,6 +163,9 @@ def _cleanup(self, text):
             line = re.sub(r'input.c:([0-9]+):([0-9]+):',
                           r'input.c:\1:nn:',
                           line)
+            line = re.sub(r'hash_format_codes.inc:([0-9]+):([0-9]+):',
+                          r'hash_format_codes.inc:\1:nn:',
+                          line)
 
             # GCC 4.8's output sometimes omits the filename prefix for a
             # diagnostic:
@@ -177,6 +180,9 @@ def _cleanup(self, text):
                           r'r->ob_refcnt: (Py_ssize_t)val',
                           line)
 
+            # Strip off " [enabled by default]" suffixes from warning lines
+            line = re.sub(r' \[enabled by default\]', '', line)
+
             # Python 3.3's unicode reimplementation drops the macro redirection
             # to narrow/wide implementations ("UCS2"/"UCS4")
             line = re.sub('PyUnicodeUCS4_AsUTF8String', 'PyUnicode_AsUTF8String', line)

testcpychecker.py

@@ -90,6 +90,13 @@ def assertNoErrors(self, src):
         return bm
 
     def assertFindsError(self, src, experr):
+        if GCC_VERSION >= 4009:
+            experr = experr.replace('$(SRCFILE):12:26:', '$(SRCFILE):12:10:')
+            experr = experr.replace('$(SRCFILE):13:25:', '$(SRCFILE):13:9:')
+            experr = experr.replace('$(SRCFILE):13:26:', '$(SRCFILE):13:10:')
+            experr = experr.replace('$(SRCFILE):14:26:', '$(SRCFILE):14:10:')
+            experr = experr.replace('$(SRCFILE):14:37:', '$(SRCFILE):14:10:')
+            experr = experr.replace('$(SRCFILE):17:26:', '$(SRCFILE):17:10:')
         if isinstance(src, SimpleModule):
             sm = src
         else: