Some testsuite fixes for GCC 5

Author: davidmalcolm

run-test-suite.py

@@ -659,6 +659,9 @@ def exclude_tests_below(path):
     # repr() for gcc.CaseLabelExpr and gcc.GimpleLabel
     exclude_test('tests/plugin/switch')
 
+if GCC_VERSION >= 5000:
+    # Avoid warning from -Wshift-count-negative
+    exclude_test('tests/cpychecker/absinterp/arithmetic/negative-shift/definite')
 
 def run_one_test(testdir):
     try:

testcpychecker.py

@@ -97,6 +97,9 @@ def assertFindsError(self, src, experr):
             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 GCC_VERSION >= 5000:
+            experr = experr.replace('$(SRCFILE):12:5:', '$(SRCFILE):12:12:')
+            experr = experr.replace('$(SRCFILE):13:5:', '$(SRCFILE):13:12:')
         if isinstance(src, SimpleModule):
             sm = src
         else:

tests/cpychecker/absinterp/comparisons/conditionals/input.c

@@ -23,6 +23,9 @@
   Test that we can cope with various kinds of comparisons
 */
 
+extern void should_not_be_reached(void);
+extern void should_be_reached(void);
+
 extern void __cpychecker_log(const char *);
 
 int test_conditionals(void)