diff options
Diffstat (limited to 'tests/run/coverage_nogil.srctree')
| -rw-r--r-- | tests/run/coverage_nogil.srctree | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/tests/run/coverage_nogil.srctree b/tests/run/coverage_nogil.srctree index 053008cc2..d51993ea5 100644 --- a/tests/run/coverage_nogil.srctree +++ b/tests/run/coverage_nogil.srctree @@ -1,5 +1,5 @@ # mode: run -# tag: coverage,trace,nogil +# tag: coverage,trace,nogil,fastgil """ PYTHON setup.py build_ext -i @@ -21,22 +21,34 @@ setup(ext_modules = cythonize([ plugins = Cython.Coverage -######## coverage_test_nogil.pyx ######## -# cython: linetrace=True +######## coverage_test_nogil_fastgil.pyx ######## +# cython: linetrace=True,fast_gil=True # distutils: define_macros=CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1 +include "_coverage_test_nogil.pxi" + +######## coverage_test_nogil_nofastgil.pyx ######## +# cython: linetrace=True,fast_gil=False +# distutils: define_macros=CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1 +include "_coverage_test_nogil.pxi" + + +######## _coverage_test_nogil.pxi ######## +# 1 +# 2 +# 3 cdef int func1(int a, int b) nogil: # 4 cdef int x # 5 with gil: # 6 x = 1 # 7 cdef int c = func2(a) + b # 8 return x + c # 9 - - +# 10 +# 11 cdef int func2(int a) with gil: # 12 return a * 2 # 13 - - +# 14 +# 15 def call(int a, int b): # 16 a, b = b, a # 17 with nogil: # 18 @@ -56,11 +68,12 @@ except ImportError: from coverage import coverage -def run_coverage(): +def run_coverage(module_name): + print("Testing module %s" % module_name) cov = coverage() cov.start() - import coverage_test_nogil as module + module = __import__(module_name) module_name = module.__name__ module_path = module_name + '.pyx' assert not any(module.__file__.endswith(ext) @@ -69,7 +82,6 @@ def run_coverage(): assert module.call(1, 2) == (1 * 2) + 2 + 1 cov.stop() - out = StringIO() cov.report(file=out) #cov.report([module], file=out) @@ -77,15 +89,17 @@ def run_coverage(): assert any(module_path in line for line in lines), \ "'%s' not found in coverage report:\n\n%s" % (module_path, out.getvalue()) - mod_file, exec_lines, excl_lines, missing_lines, _ = cov.analysis2(os.path.abspath(module_path)) - assert module_path in mod_file + module_pxi = "_coverage_test_nogil.pxi" + mod_file, exec_lines, excl_lines, missing_lines, _ = cov.analysis2(os.path.abspath(module_pxi)) + assert module_pxi in mod_file executed = set(exec_lines) - set(missing_lines) - # check that everything that runs with the gil owned was executed - assert all(line in executed for line in [12, 13, 16, 17, 18, 20]), '%s / %s' % (exec_lines, missing_lines) + # check that everything that runs with the gil owned was executed (missing due to pxi: 4, 12, 16) + assert all(line in executed for line in [13, 17, 18, 20]), '%s / %s' % (exec_lines, missing_lines) # check that everything that runs in nogil sections was executed - assert all(line in executed for line in [4, 6, 7, 8, 9]), '%s / %s' % (exec_lines, missing_lines) + assert all(line in executed for line in [6, 7, 8, 9]), '%s / %s' % (exec_lines, missing_lines) if __name__ == '__main__': - run_coverage() + for module_name in ["coverage_test_nogil_fastgil", "coverage_test_nogil_nofastgil"]: + run_coverage(module_name) |