From: Dag Sverre Seljebotn Date: Sat, 19 Jul 2008 10:10:50 +0000 (+0200) Subject: Merge with cython-devel X-Git-Tag: 0.9.8.1~49^2~95 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be78fb7083b59844fe0879610d5cafafe2c8938a;p=cython.git Merge with cython-devel --- be78fb7083b59844fe0879610d5cafafe2c8938a diff --cc runtests.py index a2a83e55,5310dd7a..650f041d --- a/runtests.py +++ b/runtests.py @@@ -45,13 -45,14 +45,15 @@@ class ErrorWriter(object) return self._collect(True, True) class TestBuilder(object): - def __init__(self, rootdir, workdir, selectors, annotate, cleanup_workdir, cleanup_sharedlibs): + def __init__(self, rootdir, workdir, selectors, annotate, - cleanup_workdir, with_pyregr): ++ cleanup_workdir, cleanup_sharedlibs, with_pyregr): self.rootdir = rootdir self.workdir = workdir self.selectors = selectors self.annotate = annotate self.cleanup_workdir = cleanup_workdir + self.cleanup_sharedlibs = cleanup_sharedlibs + self.with_pyregr = with_pyregr def build_suite(self): suite = unittest.TestSuite() @@@ -117,6 -118,6 +121,7 @@@ class CythonCompileTestCase(unittest.Te self.expect_errors = expect_errors self.annotate = annotate self.cleanup_workdir = cleanup_workdir ++ self.cleanup_sharedlibs = cleanup_sharedlibs unittest.TestCase.__init__(self) def shortDescription(self): @@@ -377,9 -375,10 +385,9 @@@ if __name__ == '__main__' if options.filetests: filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, - options.annotate_source, - options.cleanup_workdir, - options.pyregr) + options.annotate_source, options.cleanup_workdir, - options.cleanup_sharedlibs) - test_suite.addTests(filetests.build_suite()) ++ options.cleanup_sharedlibs, options.pyregr) + test_suite.addTests([filetests.build_suite()]) unittest.TextTestRunner(verbosity=options.verbosity).run(test_suite)