Commit f61e759d authored by Stefan Behnel's avatar Stefan Behnel

Fix depfile tests on Windows.

parent 5ba24b45
"""
PYTHON -m Cython.Build.Cythonize -M foo.pyx PYTHON -m Cython.Build.Cythonize -M foo.pyx
PYTHON check.py PYTHON check.py
"""
######## foo.pyx ######## ######## foo.pyx ########
...@@ -25,9 +27,7 @@ cdef inline void empty(): ...@@ -25,9 +27,7 @@ cdef inline void empty():
######## check.py ######## ######## check.py ########
import os
with open("foo.c.dep", "r") as f: with open("foo.c.dep", "r") as f:
contents = f.read().replace("\n", " ").replace("\\", "") contents = f.read().replace("\\\n", " ").replace("\n", " ")
assert sorted(contents.split()) == ['bar.pxd', 'baz.pxi', 'foo.c:', 'foo.pyx'], contents assert sorted(contents.split()) == ['bar.pxd', 'baz.pxi', 'foo.c:', 'foo.pyx'], contents
# tag: numpy # tag: numpy
"""
PYTHON -m Cython.Build.Cythonize -M dep_np.pyx PYTHON -m Cython.Build.Cythonize -M dep_np.pyx
PYTHON check_np.py PYTHON check_np.py
"""
######## dep_np.pyx ######## ######## dep_np.pyx ########
...@@ -12,14 +14,13 @@ np.import_array() ...@@ -12,14 +14,13 @@ np.import_array()
######## check_np.py ######## ######## check_np.py ########
import os import os.path
import re
import numpy as np import numpy as np
import Cython import Cython
with open("dep_np.c.dep", "r") as f: with open("dep_np.c.dep", "r") as f:
contents = f.read().replace("\n", " ").replace("\\", "") contents = f.read().replace('\\\n', ' ').replace('\n', ' ')
contents = contents.split() contents = contents.split()
...@@ -29,7 +30,11 @@ contents = [fname.replace(cy_prefix, "cy_prefix") for fname in contents] ...@@ -29,7 +30,11 @@ contents = [fname.replace(cy_prefix, "cy_prefix") for fname in contents]
np_prefix, _ = os.path.split(np.__file__) np_prefix, _ = os.path.split(np.__file__)
contents = [fname.replace(np_prefix, "np_prefix") for fname in contents] contents = [fname.replace(np_prefix, "np_prefix") for fname in contents]
expected = ['cy_prefix/Includes/cpython/buffer.pxd', contents = [path.split(os.sep) for path in contents]
contents.sort()
expected = [path.split('/') for path in [
'cy_prefix/Includes/cpython/buffer.pxd',
'cy_prefix/Includes/cpython/mem.pxd', 'cy_prefix/Includes/cpython/mem.pxd',
'cy_prefix/Includes/cpython/object.pxd', 'cy_prefix/Includes/cpython/object.pxd',
'cy_prefix/Includes/cpython/ref.pxd', 'cy_prefix/Includes/cpython/ref.pxd',
...@@ -37,13 +42,15 @@ expected = ['cy_prefix/Includes/cpython/buffer.pxd', ...@@ -37,13 +42,15 @@ expected = ['cy_prefix/Includes/cpython/buffer.pxd',
'cy_prefix/Includes/libc/stdio.pxd', 'cy_prefix/Includes/libc/stdio.pxd',
'cy_prefix/Includes/libc/string.pxd', 'cy_prefix/Includes/libc/string.pxd',
'dep_np.c:', 'dep_np.c:',
'dep_np.pyx',] 'dep_np.pyx',
]]
# Also account for legacy numpy versions, which do not ship # Also account for legacy numpy versions, which do not ship
# `__init__.pxd` hence the fallback is used: # `__init__.pxd` hence the fallback is used:
if 'cy_prefix/Includes/numpy/__init__.pxd' in contents: if ['cy_prefix', 'Includes', 'numpy', '__init__.pxd'] in contents:
expected.append('cy_prefix/Includes/numpy/__init__.pxd') expected.append(['cy_prefix', 'Includes', 'numpy', '__init__.pxd'])
else: else:
expected.append('np_prefix/__init__.pxd') expected.append(['np_prefix', '__init__.pxd'])
assert sorted(contents) == sorted(expected), sorted(contents) expected.sort()
assert contents == expected, contents
''' """
PYTHON -m Cython.Build.Cythonize -i pkg --depfile PYTHON -m Cython.Build.Cythonize -i pkg --depfile
PYTHON package_test.py PYTHON package_test.py
''' """
######## package_test.py ######## ######## package_test.py ########
import os import os.path
with open("pkg/test.c.dep", "r") as f: with open("pkg/test.c.dep", "r") as f:
contents = f.read().replace("\n", " ").replace("\\", "") contents = f.read().replace("\\\n", " ").replace("\\\n", " ")
assert sorted(contents.split()) == sorted(['test.c:', 'sub/incl.pxi', 'test.pxd', 'test.pyx']), contents assert sorted(contents.split()) == sorted(['test.c:', os.path.join('sub', 'incl.pxi'), 'test.pxd', 'test.pyx']), contents
with open("pkg/sub/test.c.dep", "r") as f: with open("pkg/sub/test.c.dep", "r") as f:
...@@ -18,7 +18,7 @@ with open("pkg/sub/test.c.dep", "r") as f: ...@@ -18,7 +18,7 @@ with open("pkg/sub/test.c.dep", "r") as f:
contents = [os.path.relpath(entry, '.') contents = [os.path.relpath(entry, '.')
if os.path.isabs(entry) else entry for entry in contents.split()] if os.path.isabs(entry) else entry for entry in contents.split()]
assert sorted(contents) == sorted(['test.c:', 'incl.pxi', 'test.pyx', '../test.pxd']), contents assert sorted(contents) == sorted(['test.c:', 'incl.pxi', 'test.pyx', os.path.join('..', 'test.pxd')]), contents
######## pkg/__init__.py ######## ######## pkg/__init__.py ########
...@@ -55,4 +55,3 @@ TEST = 'pkg.sub.test' ...@@ -55,4 +55,3 @@ TEST = 'pkg.sub.test'
######## pkg/sub/incl.pxi ######## ######## pkg/sub/incl.pxi ########
pass pass
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment