run-test-suite.py: update to handle srcdir != builddir

Author: davidmalcolm

Makefile

@@ -323,7 +323,7 @@ json-examples: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 -c libcpychecker_html/test/example1/bug.c
 
 test-suite: plugin print-gcc-version testdejagnu testdemo
-	$(INVOCATION_ENV_VARS) $(PYTHON) $(srcdir)./run-test-suite.py
+	$(INVOCATION_ENV_VARS) $(PYTHON) $(srcdir)./run-test-suite.py $(if $(srcdir),--srcdir=$(srcdir))
 
 show-ssa: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-python examples/show-ssa.py test.c

gccutils/selftests.py

@@ -24,3 +24,7 @@
 def assertEqual(lhs, rhs):
     if lhs != rhs:
         raise ValueError('non-equal values: %r != %r' % (lhs, rhs))
+
+def assertEndsWith(s, suffix):
+    if not s.endswith(suffix):
+        raise ValueError('%r does not end with %r' % (s, suffix))

run-test-suite.py

@@ -71,8 +71,9 @@ def _describe_activity(self):
         return 'compiling: %s' % ' '.join(self.args)
 
 class TestStream:
-    def __init__(self, exppath):
+    def __init__(self, exppath, srcdir):
         self.exppath = exppath
+        self.srcdir = srcdir
         if os.path.exists(exppath):
             with open(exppath) as f:
                 expdata = f.read()
@@ -112,6 +113,10 @@ def _cleanup(self, text):
                 # Handle stuff like this that changes every time:
                 # "Preprocessed source stored into /tmp/ccRm9Xgx.out file, please attach this to your bugreport."
                 continue
+
+            # Strip away references to the srcdir
+            line = re.sub(self.srcdir, '', line)
+
             # Remove exact pointer addresses from repr():
             line = re.sub(' object at (0x[0-9a-f]*)>',
                           ' object at 0xdeadbeef>',
@@ -272,14 +277,14 @@ class SkipTest(Exception):
     def __init__(self, reason):
         self.reason = reason
 
-def run_test(testdir):
+def run_test(testdir, srcdir):
     # Compile each 'input.c', using 'script.py'
     # Assume success and empty stdout; compare against expected stderr, or empty if file not present
     inputfiles = get_source_files(testdir)
     outfile = os.path.join(testdir, 'output.o')
     script_py = os.path.join(testdir, 'script.py')
-    out = TestStream(os.path.join(testdir, 'stdout.txt'))
-    err = TestStream(os.path.join(testdir, 'stderr.txt'))
+    out = TestStream(os.path.join(testdir, 'stdout.txt'), srcdir)
+    err = TestStream(os.path.join(testdir, 'stderr.txt'), srcdir)
 
     cp = configparser.SafeConfigParser()
     metadatapath = os.path.join(testdir, 'metadata.ini')
@@ -423,11 +428,18 @@ def uses_python_headers():
                   type="string",
                   dest="excluded_dirs",
                   help="exclude tests in DIR and below", metavar="DIR")
+parser.add_option("--srcdir",
+                  type="string",
+                  dest="srcdir",
+                  help="FIXME", metavar="DIR")
 parser.add_option("-s", "--show",
                   action="store_true", dest="show", default=False,
                   help="Show stdout, stderr and the command line for each test")
 (options, args) = parser.parse_args()
 
+if options.srcdir is None:
+    options.srcdir = os.getcwd() + os.sep
+
 # print (options, args)
 
 def find_tests_below(path):
@@ -445,13 +457,18 @@ def find_tests_below(path):
         testdirs += find_tests_below(path)
 else:
     # Run all the tests
-    testdirs = find_tests_below('tests')
+    path = os.path.join(options.srcdir, 'tests')
+    testdirs = find_tests_below(path)
 
 def exclude_test(test):
+    if not test.startswith(options.srcdir):
+        test = os.path.join(options.srcdir, test)
     if test in testdirs:
         testdirs.remove(test)
 
 def exclude_tests_below(path):
+    if not path.startswith(options.srcdir):
+        path = os.path.join(options.srcdir, path)
     for test in find_tests_below(path):
         exclude_test(test)
 
@@ -784,7 +801,7 @@ def exclude_tests_below(path):
 def run_one_test(testdir):
     try:
         sys.stdout.write('%s: ' % testdir)
-        run_test(testdir)
+        run_test(testdir, options.srcdir)
         print('OK')
         return (testdir, 'OK', None)
     except SkipTest:

tests/cpychecker/refcounts/json/basic/script.py

@@ -1,5 +1,5 @@
-#   Copyright 2012 David Malcolm <dmalcolm@redhat.com>
-#   Copyright 2012 Red Hat, Inc.
+#   Copyright 2012, 2019 David Malcolm <dmalcolm@redhat.com>
+#   Copyright 2012, 2019 Red Hat, Inc.
 #
 #   This is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 import gcc
 from libcpychecker.refcounts import impl_check_refcounts
 
-from gccutils.selftests import assertEqual
+from gccutils.selftests import assertEqual, assertEndsWith
 
 def verify_json(optpass, fun):
     # Only run in one pass
@@ -34,7 +34,7 @@ def verify_json(optpass, fun):
                 print(dumps(js, sort_keys=True, indent=4))
 
             # Verify the top-level JSON that's emitted:
-            assertEqual(js['filename'], 'tests/cpychecker/refcounts/json/basic/input.c')
+            assertEndsWith(js['filename'], 'tests/cpychecker/refcounts/json/basic/input.c')
             assertEqual(js['function']['name'], 'losing_refcnt_of_none')
             assertEqual(js['function']['lines'][0], 22)
             assertEqual(js['function']['lines'][1], 28)