distutils_distro.parse_config_files(cfgfiles)
EXT_DEP_MODULES = {
- 'numpy' : 'tag:numpy',
- 'pstats' : 'tag:pstats',
- 'posix' : 'tag:posix',
+ 'tag:numpy' : 'numpy',
+ 'tag:pstats': 'pstats',
+ 'tag:posix' : 'posix',
}
-def get_numpy_include_dirs():
+def update_numpy_extension(ext):
import numpy
- return [numpy.get_include()]
+ ext.include_dirs.append(numpy.get_include())
-# TODO: use tags
-EXT_DEP_INCLUDES = [
- # test name matcher , callable returning list
- (re.compile('numpy_.*').match, get_numpy_include_dirs),
-]
+EXT_EXTRAS = {
+ 'tag:numpy' : update_numpy_extension,
+}
# TODO: use tags
VER_DEP_MODULES = {
# we can only have one (3,) key. Since 2.7 is supposed to be the
# last 2.x release, things would have to change drastically for this
# to be unsafe...
- (2,999): (operator.lt, lambda x: x in ['run.special_methods_T561_py3']),
+ (2,999): (operator.lt, lambda x: x in ['run.special_methods_T561_py3',
+ 'run.test_raisefrom',
+ ]),
(3,): (operator.ge, lambda x: x in ['run.non_future_division',
'compile.extsetslice',
'compile.extdelslice',
parse_tags = memoize(parse_tags)
+list_unchanging_dir = memoize(lambda x: os.listdir(x))
+
class build_ext(_build_ext):
def build_extension(self, ext):
os.makedirs(workdir)
suite = unittest.TestSuite()
- filenames = os.listdir(path)
+ filenames = list_unchanging_dir(path)
filenames.sort()
for filename in filenames:
filepath = os.path.join(path, filename)
return suite
def build_tests(self, test_class, path, workdir, module, expect_errors, tags):
- if 'werror' in tags['tags']:
+ if 'werror' in tags['tag']:
warning_errors = True
else:
warning_errors = False
def build_target_filename(self, module_name):
target = '%s.%s' % (module_name, self.language)
return target
-
- def copy_related_files(self, test_directory, target_directory, module_name):
+
+ def related_files(self, test_directory, module_name):
is_related = re.compile('%s_.*[.].*' % module_name).match
- for filename in os.listdir(test_directory):
- if is_related(filename):
- shutil.copy(os.path.join(test_directory, filename),
- target_directory)
+ return [filename for filename in list_unchanging_dir(test_directory)
+ if is_related(filename)]
+
+ def copy_files(self, test_directory, target_directory, file_list):
+ for filename in file_list:
+ shutil.copy(os.path.join(test_directory, filename),
+ target_directory)
- def find_source_files(self, workdir, module_name):
- is_related = re.compile('%s_.*[.]%s' % (module_name, self.language)).match
- return [self.build_target_filename(module_name)] + [
- filename for filename in os.listdir(workdir)
- if is_related(filename) and os.path.isfile(os.path.join(workdir, filename)) ]
+ def source_files(self, workdir, module_name, file_list):
+ return ([self.build_target_filename(module_name)] +
+ [filename for filename in file_list
+ if not os.path.isfile(os.path.join(workdir, filename))])
def split_source_and_output(self, test_directory, module, workdir):
source_file = self.find_module_source_file(os.path.join(test_directory, module) + '.pyx')
def run_distutils(self, test_directory, module, workdir, incdir,
extra_extension_args=None):
+ original_source = self.find_module_source_file(
+ os.path.join(test_directory, module + '.pyx'))
+ try:
+ tags = parse_tags(original_source)
+ except IOError:
+ tags = {}
cwd = os.getcwd()
os.chdir(workdir)
try:
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()
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)
+ related_files = self.related_files(test_directory, module)
+ self.copy_files(test_directory, workdir, related_files)
extension = Extension(
module,
- sources = self.find_source_files(workdir, module),
- include_dirs = ext_include_dirs,
+ sources = self.source_files(workdir, module, related_files),
extra_compile_args = ext_compile_flags,
**extra_extension_args
)
+ for matcher, fixer in EXT_EXTRAS.items():
+ if isinstance(matcher, str):
+ del EXT_EXTRAS[matcher]
+ matcher = string_selector(matcher)
+ EXT_EXTRAS[matcher] = fixer
+ if matcher(module, tags):
+ extension = fixer(extension) or extension
if self.language == 'cpp':
extension.language = 'c++'
build_extension.extensions = [extension]
def run_forked_test(result, run_func, test_name, fork=True):
- if sys.version_info[0] >= 3 or not hasattr(os, 'fork') or not fork:
- run_test(result)
+ if not fork or sys.version_info[0] >= 3 or not hasattr(os, 'fork'):
+ run_func(result)
gc.collect()
return
class MissingDependencyExcluder:
def __init__(self, deps):
- # deps: { module name : matcher func }
+ # deps: { matcher func : module name }
self.exclude_matchers = []
- for mod, matcher in deps.items():
+ for matcher, mod in deps.items():
try:
__import__(mod)
except ImportError:
parser.add_option("--coverage-xml", dest="coverage_xml",
action="store_true", default=False,
help="collect source coverage data for the Compiler in XML format")
+ parser.add_option("--coverage-html", dest="coverage_html",
+ action="store_true", default=False,
+ help="collect source coverage data for the Compiler in HTML format")
parser.add_option("-A", "--annotate", dest="annotate_source",
action="store_true", default=True,
help="generate annotated HTML versions of the test source files")
WITH_CYTHON = options.with_cython
- if options.coverage or options.coverage_xml:
+ if options.coverage or options.coverage_xml or options.coverage_html:
if not WITH_CYTHON:
- options.coverage = options.coverage_xml = False
+ options.coverage = options.coverage_xml = options.coverage_html = False
else:
from coverage import coverage as _coverage
coverage = _coverage(branch=True)
result = test_runner.run(test_suite)
- if options.coverage or options.coverage_xml:
+ if options.coverage or options.coverage_xml or options.coverage_html:
coverage.stop()
ignored_modules = ('Options', 'Version', 'DebugFlags', 'CmdLine')
modules = [ module for name, module in sys.modules.items()
coverage.report(modules, show_missing=0)
if options.coverage_xml:
coverage.xml_report(modules, outfile="coverage-report.xml")
+ if options.coverage_html:
+ coverage.html_report(modules, directory="coverage-report-html")
if missing_dep_excluder.tests_missing_deps:
sys.stderr.write("Following tests excluded because of missing dependencies on your system:\n")
projects / cython.git / blobdiff