[pypy-commit] cffi static-callback-embedding: Test and fix
arigo
pypy.commits at gmail.com
Tue Jan 12 11:11:21 EST 2016
Author: Armin Rigo <arigo at tunes.org>
Branch: static-callback-embedding
Changeset: r2563:32a664384ab3
Date: 2016-01-12 17:10 +0100
http://bitbucket.org/cffi/cffi/changeset/32a664384ab3/
Log: Test and fix
diff --git a/cffi/ffiplatform.py b/cffi/ffiplatform.py
--- a/cffi/ffiplatform.py
+++ b/cffi/ffiplatform.py
@@ -78,6 +78,8 @@
_restore_val('EXT_SUFFIX', target_extention)
distutils.log.set_verbosity(compiler_verbose)
dist.run_command('build_ext')
+ cmd_obj = dist.get_command_obj('build_ext')
+ [soname] = cmd_obj.get_outputs()
finally:
distutils.log.set_threshold(old_level)
_restore_val('SO', old_SO)
@@ -86,8 +88,6 @@
distutils.errors.LinkError) as e:
raise VerificationError('%s: %s' % (e.__class__.__name__, e))
#
- cmd_obj = dist.get_command_obj('build_ext')
- [soname] = cmd_obj.get_outputs()
return soname
try:
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
@@ -68,6 +68,10 @@
match = re.compile(r"\bFILENAME: (.+)").search(output)
assert match
dynamic_lib_name = match.group(1)
+ if sys.platform == 'win32':
+ assert dynamic_lib_name.endswith('_cffi.dll')
+ else:
+ assert dynamic_lib_name.endswith('_cffi.so')
self._compiled_modules[name] = dynamic_lib_name
return self._compiled_modules[name]
More information about the pypy-commit
mailing list