X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=runtests.py;h=1aed0fcc7f81208276431aa930480f66bb945700;hb=626827013ce4c8fee3329330c6a1424427170cbc;hp=11bfa742193117f971452d99edcd1db85d222c98;hpb=1ba2eaeac21eec385fe1c3df26c6aaec686e06db;p=cython.git diff --git a/runtests.py b/runtests.py index 11bfa742..1aed0fcc 100644 --- a/runtests.py +++ b/runtests.py @@ -6,6 +6,7 @@ import re import gc import codecs import shutil +import time import unittest import doctest import operator @@ -21,12 +22,34 @@ try: except ImportError: import pickle +try: + from io import open as io_open +except ImportError: + from codecs import open as io_open + try: import threading except ImportError: # No threads, no problems threading = None +try: + from collections import defaultdict +except ImportError: + class defaultdict(object): + def __init__(self, default_factory=lambda : None): + self._dict = {} + self.default_factory = default_factory + def __getitem__(self, key): + if key not in self._dict: + self._dict[key] = self.default_factory() + return self._dict[key] + def __setitem__(self, key, value): + self._dict[key] = value + def __repr__(self): + return repr(self._dict) + WITH_CYTHON = True +CY3_DIR = None from distutils.dist import Distribution from distutils.core import Extension @@ -45,26 +68,23 @@ if sys.platform == 'win32': except ValueError: pass distutils_distro.parse_config_files(cfgfiles) -TEST_DIRS = ['compile', 'errors', 'run', 'wrappers', 'pyregr', 'build'] -TEST_RUN_DIRS = ['run', 'wrappers', 'pyregr'] - -# Lists external modules, and a matcher matching tests -# which should be excluded if the module is not present. EXT_DEP_MODULES = { - 'numpy' : re.compile('.*\.numpy_.*').match, - 'pstats' : re.compile('.*\.pstats_.*').match, - 'posix' : re.compile('.*\.posix_.*').match, + 'numpy' : 'tag:numpy', + 'pstats' : 'tag:pstats', + 'posix' : 'tag:posix', } def get_numpy_include_dirs(): import numpy return [numpy.get_include()] +# TODO: use tags EXT_DEP_INCLUDES = [ # test name matcher , callable returning list (re.compile('numpy_.*').match, get_numpy_include_dirs), ] +# TODO: use tags VER_DEP_MODULES = { # tests are excluded if 'CurrentPythonVersion OP VersionTuple', i.e. # (2,4) : (operator.lt, ...) excludes ... when PyVer < 2.4.x @@ -73,9 +93,12 @@ VER_DEP_MODULES = { ]), (2,5) : (operator.lt, lambda x: x in ['run.any', 'run.all', + 'run.relativeimport_T542', + 'run.relativeimport_star_T542', ]), (2,6) : (operator.lt, lambda x: x in ['run.print_function', 'run.cython3', + 'run.generators_py', # generators, with statement 'run.pure_py', # decorators, with statement ]), # The next line should start (3,); but this is a dictionary, so @@ -97,10 +120,42 @@ KEEP_2X_FILES = [ os.path.join('Cython', 'Debugger', 'libpython.py'), ] - +COMPILER = None INCLUDE_DIRS = [ d for d in os.getenv('INCLUDE', '').split(os.pathsep) if d ] CFLAGS = os.getenv('CFLAGS', '').split() +def memoize(f): + uncomputed = object() + f._cache = {} + def func(*args): + res = f._cache.get(args, uncomputed) + if res is uncomputed: + res = f._cache[args] = f(*args) + return res + return func + +def parse_tags(filepath): + tags = defaultdict(list) + f = io_open(filepath, encoding='ISO-8859-1', errors='replace') + try: + for line in f: + line = line.strip() + if not line: + continue + if line[0] != '#': + break + ix = line.find(':') + if ix != -1: + tag = line[1:ix].strip() + values = line[ix+1:].split(',') + tags[tag].extend([value.strip() for value in values]) + finally: + f.close() + return tags + +parse_tags = memoize(parse_tags) + + class build_ext(_build_ext): def build_extension(self, ext): if ext.language == 'c++': @@ -162,22 +217,21 @@ class TestBuilder(object): def build_suite(self): suite = unittest.TestSuite() - test_dirs = TEST_DIRS filenames = os.listdir(self.rootdir) filenames.sort() for filename in filenames: - if not WITH_CYTHON and filename == "errors": - # we won't get any errors without running Cython - continue path = os.path.join(self.rootdir, filename) - if os.path.isdir(path) and filename in test_dirs: + if os.path.isdir(path): if filename == 'pyregr' and not self.with_pyregr: continue + if filename == 'broken' and not self.test_bugs: + continue suite.addTest( self.handle_directory(path, filename)) - if sys.platform not in ['win32'] and sys.version_info[0] < 3: - # Non-Windows makefile, can't run Cython under Py3. - if [1 for selector in self.selectors if selector("embedded")]: + if sys.platform not in ['win32']: + # Non-Windows makefile. + if [1 for selector in self.selectors if selector("embedded")] \ + and not [1 for selector in self.exclude_selectors if selector("embedded")]: suite.addTest(unittest.makeSuite(EmbedTest)) return suite @@ -186,64 +240,81 @@ class TestBuilder(object): if not os.path.exists(workdir): os.makedirs(workdir) - expect_errors = (context == 'errors') suite = unittest.TestSuite() filenames = os.listdir(path) filenames.sort() for filename in filenames: - if context == "build" and filename.endswith(".srctree"): - if not [ 1 for match in self.selectors if match(filename) ]: - continue - suite.addTest(EndToEndTest(filename, workdir, self.cleanup_workdir)) - continue - if not (filename.endswith(".pyx") or filename.endswith(".py")): - continue - if filename.startswith('.'): continue # certain emacs backup files - if context == 'pyregr' and not filename.startswith('test_'): + filepath = os.path.join(path, filename) + module, ext = os.path.splitext(filename) + if ext not in ('.py', '.pyx', '.srctree'): continue - module = os.path.splitext(filename)[0] + if filename.startswith('.'): + continue # certain emacs backup files + tags = parse_tags(filepath) fqmodule = "%s.%s" % (context, module) if not [ 1 for match in self.selectors - if match(fqmodule) ]: + if match(fqmodule, tags) ]: continue if self.exclude_selectors: - if [1 for match in self.exclude_selectors if match(fqmodule)]: + if [1 for match in self.exclude_selectors + if match(fqmodule, tags)]: + continue + + mode = 'run' # default + if tags['mode']: + mode = tags['mode'][0] + elif context == 'pyregr': + mode = 'pyregr' + + if ext == '.srctree': + suite.addTest(EndToEndTest(filepath, workdir, self.cleanup_workdir)) + continue + + # Choose the test suite. + if mode == 'pyregr': + if not filename.startswith('test_'): continue - if context == 'pyregr': test_class = CythonPyregrTestCase - elif context in TEST_RUN_DIRS: + elif mode == 'run': if module.startswith("test_"): test_class = CythonUnitTestCase else: test_class = CythonRunTestCase else: test_class = CythonCompileTestCase + for test in self.build_tests(test_class, path, workdir, - module, expect_errors): + module, mode == 'error', tags): suite.addTest(test) - if context == 'run' and filename.endswith('.py'): + if mode == 'run' and ext == '.py': # additionally test file in real Python suite.addTest(PureDoctestTestCase(module, os.path.join(path, filename))) + return suite - def build_tests(self, test_class, path, workdir, module, expect_errors): + def build_tests(self, test_class, path, workdir, module, expect_errors, tags): + if 'werror' in tags['tags']: + warning_errors = True + else: + warning_errors = False + if expect_errors: - if 'cpp' in module and 'cpp' in self.languages: + if 'cpp' in tags['tag'] and 'cpp' in self.languages: languages = ['cpp'] else: languages = self.languages[:1] else: languages = self.languages - if 'cpp' in module and 'c' in languages: + if 'cpp' in tags['tag'] and 'c' in languages: languages = list(languages) languages.remove('c') tests = [ self.build_test(test_class, path, workdir, module, - language, expect_errors) + language, expect_errors, warning_errors) for language in languages ] return tests def build_test(self, test_class, path, workdir, module, - language, expect_errors): + language, expect_errors, warning_errors): workdir = os.path.join(workdir, language) if not os.path.exists(workdir): os.makedirs(workdir) @@ -255,13 +326,14 @@ class TestBuilder(object): cleanup_sharedlibs=self.cleanup_sharedlibs, cython_only=self.cython_only, fork=self.fork, - language_level=self.language_level) + language_level=self.language_level, + warning_errors=warning_errors) class CythonCompileTestCase(unittest.TestCase): def __init__(self, test_directory, workdir, module, language='c', expect_errors=False, annotate=False, cleanup_workdir=True, cleanup_sharedlibs=True, cython_only=False, fork=True, - language_level=2): + language_level=2, warning_errors=False): self.test_directory = test_directory self.workdir = workdir self.module = module @@ -273,16 +345,26 @@ class CythonCompileTestCase(unittest.TestCase): self.cython_only = cython_only self.fork = fork self.language_level = language_level + self.warning_errors = warning_errors unittest.TestCase.__init__(self) def shortDescription(self): return "compiling (%s) %s" % (self.language, self.module) def setUp(self): + from Cython.Compiler import Options + self._saved_options = [ (name, getattr(Options, name)) + for name in ('warning_errors', 'error_on_unknown_names') ] + Options.warning_errors = self.warning_errors + if self.workdir not in sys.path: sys.path.insert(0, self.workdir) def tearDown(self): + from Cython.Compiler import Options + for name, value in self._saved_options: + setattr(Options, name, value) + try: sys.path.remove(self.workdir) except ValueError: @@ -344,10 +426,10 @@ class CythonCompileTestCase(unittest.TestCase): def split_source_and_output(self, test_directory, module, workdir): source_file = self.find_module_source_file(os.path.join(test_directory, module) + '.pyx') - source_and_output = codecs.open(source_file, 'rU', 'ISO-8859-1') + source_and_output = io_open(source_file, 'rU', encoding='ISO-8859-1') try: - out = codecs.open(os.path.join(workdir, module + os.path.splitext(source_file)[1]), - 'w', 'ISO-8859-1') + out = io_open(os.path.join(workdir, module + os.path.splitext(source_file)[1]), + 'w', encoding='ISO-8859-1') for line in source_and_output: last_line = line if line.startswith("_ERRORS"): @@ -409,20 +491,24 @@ class CythonCompileTestCase(unittest.TestCase): if incdir: build_extension.include_dirs.append(incdir) build_extension.finalize_options() + if COMPILER: + build_extension.compiler = COMPILER ext_include_dirs = [] for match, get_additional_include_dirs in EXT_DEP_INCLUDES: if match(module): ext_include_dirs += get_additional_include_dirs() - self.copy_related_files(test_directory, workdir, module) - + ext_compile_flags = CFLAGS[:] + if build_extension.compiler == 'mingw32': + ext_compile_flags.append('-Wno-format') if extra_extension_args is None: extra_extension_args = {} + self.copy_related_files(test_directory, workdir, module) extension = Extension( module, sources = self.find_source_files(workdir, module), include_dirs = ext_include_dirs, - extra_compile_args = CFLAGS, + extra_compile_args = ext_compile_flags, **extra_extension_args ) if self.language == 'cpp': @@ -655,6 +741,11 @@ class CythonUnitTestCase(CythonRunTestCase): class CythonPyregrTestCase(CythonRunTestCase): + def setUp(self): + CythonRunTestCase.setUp(self) + from Cython.Compiler import Options + Options.error_on_unknown_names = False + def _run_unittest(self, result, *classes): """Run tests from unittest.TestCase-derived classes.""" valid_types = (unittest.TestSuite, unittest.TestCase) @@ -709,8 +800,7 @@ def collect_unittests(path, module_prefix, suite, selectors): if include_debugger: skipped_dirs = [] else: - cython_dir = os.path.dirname(os.path.abspath(__file__)) - skipped_dirs = [os.path.join(cython_dir, 'Cython', 'Debugger')] + skipped_dirs = ['Cython' + os.path.sep + 'Debugger' + os.path.sep] for dirpath, dirnames, filenames in os.walk(path): if dirpath != path and "__init__.py" not in filenames: @@ -786,8 +876,9 @@ class EndToEndTest(unittest.TestCase): cython_root = os.path.dirname(os.path.abspath(__file__)) def __init__(self, treefile, workdir, cleanup_workdir=True): + self.name = os.path.splitext(os.path.basename(treefile))[0] self.treefile = treefile - self.workdir = os.path.join(workdir, os.path.splitext(treefile)[0]) + self.workdir = os.path.join(workdir, self.name) self.cleanup_workdir = cleanup_workdir cython_syspath = self.cython_root for path in sys.path[::-1]: @@ -800,12 +891,11 @@ class EndToEndTest(unittest.TestCase): unittest.TestCase.__init__(self) def shortDescription(self): - return "End-to-end %s" % self.treefile + return "End-to-end %s" % self.name def setUp(self): from Cython.TestUtils import unpack_source_tree - _, self.commands = unpack_source_tree( - os.path.join('tests', 'build', self.treefile), self.workdir) + _, self.commands = unpack_source_tree(self.treefile, self.workdir) self.old_dir = os.getcwd() os.chdir(self.workdir) if self.workdir not in sys.path: @@ -813,7 +903,13 @@ class EndToEndTest(unittest.TestCase): def tearDown(self): if self.cleanup_workdir: - shutil.rmtree(self.workdir) + for trial in range(5): + try: + shutil.rmtree(self.workdir) + except OSError: + time.sleep(0.1) + else: + break os.chdir(self.old_dir) def runTest(self): @@ -878,8 +974,12 @@ class EmbedTest(unittest.TestCase): if not os.path.isdir(libdir) or libname not in os.listdir(libdir): # report the error for the original directory libdir = sysconfig.get_config_var('LIBDIR') + cython = 'cython.py' + if sys.version_info[0] >=3 and CY3_DIR: + cython = os.path.join(CY3_DIR, cython) + cython = os.path.abspath(os.path.join('..', '..', cython)) self.assert_(os.system( - "make PYTHON='%s' LIBDIR1='%s' test > make.output" % (sys.executable, libdir)) == 0) + "make PYTHON='%s' CYTHON='%s' LIBDIR1='%s' test > make.output" % (sys.executable, cython, libdir)) == 0) try: os.remove('make.output') except OSError: @@ -893,11 +993,11 @@ class MissingDependencyExcluder: try: __import__(mod) except ImportError: - self.exclude_matchers.append(matcher) + self.exclude_matchers.append(string_selector(matcher)) self.tests_missing_deps = [] - def __call__(self, testname): + def __call__(self, testname, tags=None): for matcher in self.exclude_matchers: - if matcher(testname): + if matcher(testname, tags): self.tests_missing_deps.append(testname) return True return False @@ -911,7 +1011,7 @@ class VersionDependencyExcluder: if compare(version_info, ver): self.exclude_matchers.append(matcher) self.tests_missing_deps = [] - def __call__(self, testname): + def __call__(self, testname, tags=None): for matcher in self.exclude_matchers: if matcher(testname): self.tests_missing_deps.append(testname) @@ -931,9 +1031,37 @@ class FileListExcluder: finally: f.close() - def __call__(self, testname): + def __call__(self, testname, tags=None): return testname in self.excludes or testname.split('.')[-1] in self.excludes +class TagsSelector: + + def __init__(self, tag, value): + self.tag = tag + self.value = value + + def __call__(self, testname, tags=None): + if tags is None: + return False + else: + return self.value in tags[self.tag] + +class RegExSelector: + + def __init__(self, pattern_string): + self.pattern = re.compile(pattern_string, re.I|re.U) + + def __call__(self, testname, tags=None): + return self.pattern.search(testname) + +def string_selector(s): + ix = s.find(':') + if ix == -1: + return RegExSelector(s) + else: + return TagsSelector(s[:ix], s[ix+1:]) + + def refactor_for_py3(distdir, cy3_dir): # need to convert Cython sources first import lib2to3.refactor @@ -953,6 +1081,7 @@ def refactor_for_py3(distdir, cy3_dir): recursive-include Cython *.py *.pyx *.pxd recursive-include Cython/Debugger/Tests * include runtests.py + include cython.py ''') sys.path.insert(0, cy3_dir) @@ -1006,6 +1135,8 @@ def main(): parser.add_option("--no-cython", dest="with_cython", action="store_false", default=True, help="do not run the Cython compiler, only the C compiler") + parser.add_option("--compiler", dest="compiler", default=None, + help="C compiler type") parser.add_option("--no-c", dest="use_c", action="store_false", default=True, help="do not test C compilation") @@ -1089,7 +1220,8 @@ def main(): for name in cy_modules: del sys.modules[name] # hasn't been refactored yet - do it now - cy3_dir = os.path.join(WORKDIR, 'Cy3') + global CY3_DIR + CY3_DIR = cy3_dir = os.path.join(WORKDIR, 'Cy3') if sys.version_info >= (3,1): refactor_for_py3(DISTDIR, cy3_dir) elif os.path.isdir(cy3_dir): @@ -1123,7 +1255,7 @@ def main(): # RUN ALL TESTS! UNITTEST_MODULE = "Cython" - UNITTEST_ROOT = os.path.join(os.getcwd(), UNITTEST_MODULE) + UNITTEST_ROOT = os.path.join(os.path.dirname(__file__), UNITTEST_MODULE) if WITH_CYTHON: if os.path.exists(WORKDIR): for path in os.listdir(WORKDIR): @@ -1162,16 +1294,16 @@ def main(): if options.tickets: for ticket_number in options.tickets: test_bugs = True - cmd_args.append('.*T%s$' % ticket_number) + cmd_args.append('ticket:%s' % ticket_number) if not test_bugs: for selector in cmd_args: if selector.startswith('bugs'): test_bugs = True import re - selectors = [ re.compile(r, re.I|re.U).search for r in cmd_args ] + selectors = [ string_selector(r) for r in cmd_args ] if not selectors: - selectors = [ lambda x:True ] + selectors = [ lambda x, tags=None: True ] # Chech which external modules are not present and exclude tests # which depends on them (by prefix) @@ -1181,7 +1313,7 @@ def main(): exclude_selectors = [missing_dep_excluder, version_dep_excluder] # want to pring msg at exit if options.exclude: - exclude_selectors += [ re.compile(r, re.I|re.U).search for r in options.exclude ] + exclude_selectors += [ string_selector(r) for r in options.exclude ] if not test_bugs: exclude_selectors += [ FileListExcluder(os.path.join(ROOTDIR, "bugs.txt")) ] @@ -1189,6 +1321,9 @@ def main(): if sys.platform in ['win32', 'cygwin'] and sys.version_info < (2,6): exclude_selectors += [ lambda x: x == "run.specialfloat" ] + global COMPILER + if options.compiler: + COMPILER = options.compiler languages = [] if options.use_c: languages.append('c') @@ -1212,15 +1347,15 @@ def main(): test_suite.addTest(filetests.build_suite()) if options.system_pyregr and languages: - filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, exclude_selectors, - options.annotate_source, options.cleanup_workdir, - options.cleanup_sharedlibs, True, - options.cython_only, languages, test_bugs, - options.fork, options.language_level) - test_suite.addTest( - filetests.handle_directory( - os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3], 'test'), - 'pyregr')) + sys_pyregr_dir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3], 'test') + if os.path.isdir(sys_pyregr_dir): + filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, exclude_selectors, + options.annotate_source, options.cleanup_workdir, + options.cleanup_sharedlibs, True, + options.cython_only, languages, test_bugs, + options.fork, sys.version_info[0]) + sys.stderr.write("Including CPython regression tests in %s\n" % sys_pyregr_dir) + test_suite.addTest(filetests.handle_directory(sys_pyregr_dir, 'pyregr')) if options.xml_output_dir: from Cython.Tests.xmlrunner import XMLTestRunner