Author: Armin Rigo <[email protected]>
Branch: static-callback-embedding
Changeset: r2565:aeaadd68f498
Date: 2016-01-12 18:04 +0200
http://bitbucket.org/cffi/cffi/changeset/aeaadd68f498/
Log: two tests pass on windows! progress
diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -58,6 +58,7 @@
MSVCCompiler._remove_visual_c_ref = lambda self,manifest_file:
manifest_file
def _win32_unhack_for_embedding():
+ from distutils.msvc9compiler import MSVCCompiler
MSVCCompiler._remove_visual_c_ref = \
MSVCCompiler._remove_visual_c_ref_CFFI_BAK
diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py
--- a/testing/embedding/test_basic.py
+++ b/testing/embedding/test_basic.py
@@ -4,9 +4,6 @@
from testing.udir import udir
import cffi
-if sys.platform == 'win32':
- py.test.skip("it 'should' work on Windows, but I did not manage at all"
- " to make these tests pass. Please help")
local_dir = os.path.dirname(os.path.abspath(__file__))
_link_error = '?'
@@ -34,6 +31,8 @@
def setup_method(self, meth):
check_lib_python_found(str(udir.ensure('embedding', dir=1)))
self._path = udir.join('embedding', meth.__name__)
+ if sys.platform == "win32":
+ self._compiled_modules.clear() # workaround
def get_path(self):
return str(self._path.ensure(dir=1))
@@ -90,7 +89,7 @@
libfiles = []
for m in modules:
m = os.path.basename(m)
- assert m.endswith('.pyd')
+ assert m.endswith('.dll')
libfiles.append('Release\\%s.lib' % m[:-4])
modules = libfiles
elif threads:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
