[pypy-commit] pypy default: Update to cffi/8aa5648077c6
arigo
noreply at buildbot.pypy.org
Fri Feb 28 10:56:01 CET 2014
Author: Armin Rigo <arigo at tunes.org>
Branch:
Changeset: r69541:8d8d72389794
Date: 2014-02-28 10:52 +0100
http://bitbucket.org/pypy/pypy/changeset/8d8d72389794/
Log: Update to cffi/8aa5648077c6
diff --git a/lib_pypy/cffi/__init__.py b/lib_pypy/cffi/__init__.py
--- a/lib_pypy/cffi/__init__.py
+++ b/lib_pypy/cffi/__init__.py
@@ -4,5 +4,5 @@
from .api import FFI, CDefError, FFIError
from .ffiplatform import VerificationError, VerificationMissing
-__version__ = "0.8.1"
-__version_info__ = (0, 8, 1)
+__version__ = "0.8.2"
+__version_info__ = (0, 8, 2)
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -1,4 +1,4 @@
-import types
+import sys, types
from .lock import allocate_lock
try:
@@ -88,18 +88,20 @@
self.NULL = self.cast(self.BVoidP, 0)
self.CData, self.CType = backend._get_types()
- def cdef(self, csource, override=False):
+ def cdef(self, csource, override=False, packed=False):
"""Parse the given C source. This registers all declared functions,
types, and global variables. The functions and global variables can
then be accessed via either 'ffi.dlopen()' or 'ffi.verify()'.
The types can be used in 'ffi.new()' and other functions.
+ If 'packed' is specified as True, all structs declared inside this
+ cdef are packed, i.e. laid out without any field alignment at all.
"""
if not isinstance(csource, str): # unicode, on Python 2
if not isinstance(csource, basestring):
raise TypeError("cdef() argument must be a string")
csource = csource.encode('ascii')
with self._lock:
- self._parser.parse(csource, override=override)
+ self._parser.parse(csource, override=override, packed=packed)
self._cdefsources.append(csource)
if override:
for cache in self._function_caches:
@@ -387,22 +389,27 @@
return self._backend.from_handle(x)
-def _make_ffi_library(ffi, libname, flags):
- import os
- name = libname
+def _load_backend_lib(backend, name, flags):
if name is None:
- name = 'c' # on Posix only
- backend = ffi._backend
+ if sys.platform != "win32":
+ return backend.load_library(None, flags)
+ name = "c" # Windows: load_library(None) fails, but this works
+ # (backward compatibility hack only)
try:
if '.' not in name and '/' not in name:
raise OSError("library not found: %r" % (name,))
- backendlib = backend.load_library(name, flags)
+ return backend.load_library(name, flags)
except OSError:
import ctypes.util
path = ctypes.util.find_library(name)
if path is None:
raise # propagate the original OSError
- backendlib = backend.load_library(path, flags)
+ return backend.load_library(path, flags)
+
+def _make_ffi_library(ffi, libname, flags):
+ import os
+ backend = ffi._backend
+ backendlib = _load_backend_lib(backend, libname, flags)
copied_enums = []
#
def make_accessor_locked(name):
diff --git a/lib_pypy/cffi/backend_ctypes.py b/lib_pypy/cffi/backend_ctypes.py
--- a/lib_pypy/cffi/backend_ctypes.py
+++ b/lib_pypy/cffi/backend_ctypes.py
@@ -720,7 +720,7 @@
return self._new_struct_or_union('union', name, ctypes.Union)
def complete_struct_or_union(self, CTypesStructOrUnion, fields, tp,
- totalsize=-1, totalalignment=-1):
+ totalsize=-1, totalalignment=-1, sflags=0):
if totalsize >= 0 or totalalignment >= 0:
raise NotImplementedError("the ctypes backend of CFFI does not support "
"structures completed by verify(); please "
@@ -739,6 +739,8 @@
else:
cfields.append((fname, BField._ctype, bitsize))
bfield_types[fname] = Ellipsis
+ if sflags & 8:
+ struct_or_union._pack_ = 1
struct_or_union._fields_ = cfields
CTypesStructOrUnion._bfield_types = bfield_types
#
diff --git a/lib_pypy/cffi/cparser.py b/lib_pypy/cffi/cparser.py
--- a/lib_pypy/cffi/cparser.py
+++ b/lib_pypy/cffi/cparser.py
@@ -98,6 +98,7 @@
self._anonymous_counter = 0
self._structnode2type = weakref.WeakKeyDictionary()
self._override = False
+ self._packed = False
def _parse(self, csource):
csource, macros = _preprocess(csource)
@@ -147,13 +148,16 @@
msg = 'parse error\n%s' % (msg,)
raise api.CDefError(msg)
- def parse(self, csource, override=False):
+ def parse(self, csource, override=False, packed=False):
prev_override = self._override
+ prev_packed = self._packed
try:
self._override = override
+ self._packed = packed
self._internal_parse(csource)
finally:
self._override = prev_override
+ self._packed = prev_packed
def _internal_parse(self, csource):
ast, macros = self._parse(csource)
@@ -476,6 +480,7 @@
if isinstance(tp, model.StructType) and tp.partial:
raise NotImplementedError("%s: using both bitfields and '...;'"
% (tp,))
+ tp.packed = self._packed
return tp
def _make_partial(self, tp, nested):
diff --git a/lib_pypy/cffi/model.py b/lib_pypy/cffi/model.py
--- a/lib_pypy/cffi/model.py
+++ b/lib_pypy/cffi/model.py
@@ -1,4 +1,6 @@
+import types
import weakref
+
from .lock import allocate_lock
@@ -81,29 +83,29 @@
'long': 'i',
'long long': 'i',
'signed char': 'i',
- 'unsigned char': 'u',
- 'unsigned short': 'u',
- 'unsigned int': 'u',
- 'unsigned long': 'u',
- 'unsigned long long': 'u',
+ 'unsigned char': 'i',
+ 'unsigned short': 'i',
+ 'unsigned int': 'i',
+ 'unsigned long': 'i',
+ 'unsigned long long': 'i',
'float': 'f',
'double': 'f',
'long double': 'f',
- '_Bool': 'u',
+ '_Bool': 'i',
# the following types are not primitive in the C sense
'wchar_t': 'c',
'int8_t': 'i',
- 'uint8_t': 'u',
+ 'uint8_t': 'i',
'int16_t': 'i',
- 'uint16_t': 'u',
+ 'uint16_t': 'i',
'int32_t': 'i',
- 'uint32_t': 'u',
+ 'uint32_t': 'i',
'int64_t': 'i',
- 'uint64_t': 'u',
+ 'uint64_t': 'i',
'intptr_t': 'i',
- 'uintptr_t': 'u',
+ 'uintptr_t': 'i',
'ptrdiff_t': 'i',
- 'size_t': 'u',
+ 'size_t': 'i',
'ssize_t': 'i',
}
@@ -114,12 +116,8 @@
def is_char_type(self):
return self.ALL_PRIMITIVE_TYPES[self.name] == 'c'
- def is_signed_type(self):
+ def is_integer_type(self):
return self.ALL_PRIMITIVE_TYPES[self.name] == 'i'
- def is_unsigned_type(self):
- return self.ALL_PRIMITIVE_TYPES[self.name] == 'u'
- def is_integer_type(self):
- return self.ALL_PRIMITIVE_TYPES[self.name] in 'iu'
def is_float_type(self):
return self.ALL_PRIMITIVE_TYPES[self.name] == 'f'
@@ -259,6 +257,7 @@
fixedlayout = None
completed = False
partial = False
+ packed = False
def __init__(self, name, fldnames, fldtypes, fldbitsize):
self.name = name
@@ -315,7 +314,11 @@
fldtypes = [tp.get_cached_btype(ffi, finishlist)
for tp in self.fldtypes]
lst = list(zip(self.fldnames, fldtypes, self.fldbitsize))
- ffi._backend.complete_struct_or_union(BType, lst, self)
+ sflags = 0
+ if self.packed:
+ sflags = 8 # SF_PACKED
+ ffi._backend.complete_struct_or_union(BType, lst, self,
+ -1, -1, sflags)
#
else:
fldtypes = []
@@ -468,8 +471,7 @@
# initialize the __typecache attribute, either at the module level
# if ffi._backend is a module, or at the class level if ffi._backend
# is some instance.
- ModuleType = type(weakref)
- if isinstance(ffi._backend, ModuleType):
+ if isinstance(ffi._backend, types.ModuleType):
ffi._backend.__typecache = weakref.WeakValueDictionary()
else:
type(ffi._backend).__typecache = weakref.WeakValueDictionary()
diff --git a/lib_pypy/cffi/vengine_cpy.py b/lib_pypy/cffi/vengine_cpy.py
--- a/lib_pypy/cffi/vengine_cpy.py
+++ b/lib_pypy/cffi/vengine_cpy.py
@@ -214,10 +214,7 @@
extraarg = ''
if isinstance(tp, model.PrimitiveType):
if tp.is_integer_type() and tp.name != '_Bool':
- if tp.is_signed_type():
- converter = '_cffi_to_c_SIGNED'
- else:
- converter = '_cffi_to_c_UNSIGNED'
+ converter = '_cffi_to_c_int'
extraarg = ', %s' % tp.name
else:
converter = '_cffi_to_c_%s' % (tp.name.replace(' ', '_'),)
@@ -270,10 +267,7 @@
def _convert_expr_from_c(self, tp, var, context):
if isinstance(tp, model.PrimitiveType):
if tp.is_integer_type():
- if tp.is_signed_type():
- return '_cffi_from_c_SIGNED(%s, %s)' % (var, tp.name)
- else:
- return '_cffi_from_c_UNSIGNED(%s, %s)' % (var, tp.name)
+ return '_cffi_from_c_int(%s, %s)' % (var, tp.name)
elif tp.name != 'long double':
return '_cffi_from_c_%s(%s)' % (tp.name.replace(' ', '_'), var)
else:
@@ -801,25 +795,23 @@
#define _cffi_to_c_double PyFloat_AsDouble
#define _cffi_to_c_float PyFloat_AsDouble
-#define _cffi_from_c_SIGNED(x, type) \
- (sizeof(type) <= sizeof(long) ? PyInt_FromLong(x) : \
- PyLong_FromLongLong(x))
-#define _cffi_from_c_UNSIGNED(x, type) \
- (sizeof(type) < sizeof(long) ? PyInt_FromLong(x) : \
- sizeof(type) == sizeof(long) ? PyLong_FromUnsignedLong(x) : \
- PyLong_FromUnsignedLongLong(x))
+#define _cffi_from_c_int(x, type) \
+ (((type)-1) > 0 ? /* unsigned */ \
+ (sizeof(type) < sizeof(long) ? PyInt_FromLong(x) : \
+ sizeof(type) == sizeof(long) ? PyLong_FromUnsignedLong(x) : \
+ PyLong_FromUnsignedLongLong(x)) \
+ : (sizeof(type) <= sizeof(long) ? PyInt_FromLong(x) : \
+ PyLong_FromLongLong(x)))
-#define _cffi_to_c_SIGNED(o, type) \
- (sizeof(type) == 1 ? _cffi_to_c_i8(o) : \
- sizeof(type) == 2 ? _cffi_to_c_i16(o) : \
- sizeof(type) == 4 ? _cffi_to_c_i32(o) : \
- sizeof(type) == 8 ? _cffi_to_c_i64(o) : \
- (Py_FatalError("unsupported size for type " #type), 0))
-#define _cffi_to_c_UNSIGNED(o, type) \
- (sizeof(type) == 1 ? _cffi_to_c_u8(o) : \
- sizeof(type) == 2 ? _cffi_to_c_u16(o) : \
- sizeof(type) == 4 ? _cffi_to_c_u32(o) : \
- sizeof(type) == 8 ? _cffi_to_c_u64(o) : \
+#define _cffi_to_c_int(o, type) \
+ (sizeof(type) == 1 ? (((type)-1) > 0 ? _cffi_to_c_u8(o) \
+ : _cffi_to_c_i8(o)) : \
+ sizeof(type) == 2 ? (((type)-1) > 0 ? _cffi_to_c_u16(o) \
+ : _cffi_to_c_i16(o)) : \
+ sizeof(type) == 4 ? (((type)-1) > 0 ? _cffi_to_c_u32(o) \
+ : _cffi_to_c_i32(o)) : \
+ sizeof(type) == 8 ? (((type)-1) > 0 ? _cffi_to_c_u64(o) \
+ : _cffi_to_c_i64(o)) : \
(Py_FatalError("unsupported size for type " #type), 0))
#define _cffi_to_c_i8 \
diff --git a/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py b/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
--- a/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
@@ -1,5 +1,6 @@
# Generated by pypy/tool/import_cffi.py
import py
+import platform
import sys, ctypes
from cffi import FFI, CDefError
from pypy.module.test_lib_pypy.cffi_tests.support import *
@@ -756,6 +757,8 @@
p = ffi.cast("long long", ffi.cast("wchar_t", -1))
if SIZE_OF_WCHAR == 2: # 2 bytes, unsigned
assert int(p) == 0xffff
+ elif platform.machine() == 'aarch64': # 4 bytes, unsigned
+ assert int(p) == 0xffffffff
else: # 4 bytes, signed
assert int(p) == -1
p = ffi.cast("int", u+'\u1234')
@@ -1550,3 +1553,21 @@
ffi2.include(ffi1)
p = ffi2.new("foo_p", [142])
assert p.x == 142
+
+ def test_struct_packed(self):
+ ffi = FFI(backend=self.Backend())
+ ffi.cdef("struct nonpacked { char a; int b; };")
+ ffi.cdef("struct is_packed { char a; int b; };", packed=True)
+ assert ffi.sizeof("struct nonpacked") == 8
+ assert ffi.sizeof("struct is_packed") == 5
+ assert ffi.alignof("struct nonpacked") == 4
+ assert ffi.alignof("struct is_packed") == 1
+ s = ffi.new("struct is_packed[2]")
+ s[0].b = 42623381
+ s[0].a = 'X'
+ s[1].b = -4892220
+ s[1].a = 'Y'
+ assert s[0].b == 42623381
+ assert s[0].a == 'X'
+ assert s[1].b == -4892220
+ assert s[1].a == 'Y'
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_function.py b/pypy/module/test_lib_pypy/cffi_tests/test_function.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_function.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_function.py
@@ -251,22 +251,14 @@
py.test.skip("probably no symbol 'stdout' in the lib")
ffi = FFI(backend=self.Backend())
ffi.cdef("""
- int puts(const char *);
- void *stdout, *stderr;
+ void *stdout;
""")
- ffi.C = ffi.dlopen(None)
- pout = ffi.C.stdout
- perr = ffi.C.stderr
- assert repr(pout).startswith("<cdata 'void *' 0x")
- assert repr(perr).startswith("<cdata 'void *' 0x")
- with FdWriteCapture(2) as fd: # capturing stderr
- ffi.C.stdout = perr
- try:
- ffi.C.puts(b"hello!") # goes to stdout, which is equal to stderr now
- finally:
- ffi.C.stdout = pout
- res = fd.getvalue()
- assert res == b"hello!\n"
+ C = ffi.dlopen(None)
+ pout = C.stdout
+ C.stdout = ffi.NULL
+ assert C.stdout == ffi.NULL
+ C.stdout = pout
+ assert C.stdout == pout
def test_strchr(self):
ffi = FFI(backend=self.Backend())
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py b/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
@@ -12,9 +12,9 @@
def load_library(self, name, flags):
if sys.platform == 'win32':
- assert "msvcr" in name
+ assert name is None or "msvcr" in name
else:
- assert "libc" in name or "libm" in name
+ assert name is None or "libc" in name or "libm" in name
return FakeLibrary()
def new_function_type(self, args, result, has_varargs):
@@ -33,7 +33,8 @@
def new_struct_type(self, name):
return FakeStruct(name)
- def complete_struct_or_union(self, s, fields, tp=None):
+ def complete_struct_or_union(self, s, fields, tp=None,
+ totalsize=-1, totalalignment=-1, sflags=0):
assert isinstance(s, FakeStruct)
s.fields = fields
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
@@ -64,13 +64,13 @@
def test_simple_case():
ffi = FFI()
ffi.cdef("double sin(double x);")
- lib = ffi.verify('#include <math.h>')
+ lib = ffi.verify('#include <math.h>', libraries=["m"])
assert lib.sin(1.23) == math.sin(1.23)
def test_rounding_1():
ffi = FFI()
ffi.cdef("float sin(double x);")
- lib = ffi.verify('#include <math.h>')
+ lib = ffi.verify('#include <math.h>', libraries=["m"])
res = lib.sin(1.23)
assert res != math.sin(1.23) # not exact, because of double->float
assert abs(res - math.sin(1.23)) < 1E-5
@@ -78,7 +78,7 @@
def test_rounding_2():
ffi = FFI()
ffi.cdef("double sin(float x);")
- lib = ffi.verify('#include <math.h>')
+ lib = ffi.verify('#include <math.h>', libraries=["m"])
res = lib.sin(1.23)
assert res != math.sin(1.23) # not exact, because of double->float
assert abs(res - math.sin(1.23)) < 1E-5
@@ -104,7 +104,7 @@
def test_longdouble():
ffi = FFI()
ffi.cdef("long double sinl(long double x);")
- lib = ffi.verify('#include <math.h>')
+ lib = ffi.verify('#include <math.h>', libraries=["m"])
for input in [1.23,
ffi.cast("double", 1.23),
ffi.cast("long double", 1.23)]:
@@ -149,28 +149,27 @@
all_primitive_types = model.PrimitiveType.ALL_PRIMITIVE_TYPES
-all_signed_integer_types = sorted(tp for tp in all_primitive_types
- if all_primitive_types[tp] == 'i')
-all_unsigned_integer_types = sorted(tp for tp in all_primitive_types
- if all_primitive_types[tp] == 'u')
+all_integer_types = sorted(tp for tp in all_primitive_types
+ if all_primitive_types[tp] == 'i')
all_float_types = sorted(tp for tp in all_primitive_types
if all_primitive_types[tp] == 'f')
+def all_signed_integer_types(ffi):
+ return [x for x in all_integer_types if int(ffi.cast(x, -1)) < 0]
+
+def all_unsigned_integer_types(ffi):
+ return [x for x in all_integer_types if int(ffi.cast(x, -1)) > 0]
+
+
def test_primitive_category():
for typename in all_primitive_types:
tp = model.PrimitiveType(typename)
C = tp.is_char_type()
- U = tp.is_unsigned_type()
- S = tp.is_signed_type()
F = tp.is_float_type()
I = tp.is_integer_type()
assert C == (typename in ('char', 'wchar_t'))
- assert U == (typename.startswith('unsigned ') or
- typename == '_Bool' or typename == 'size_t' or
- typename == 'uintptr_t' or typename.startswith('uint'))
assert F == (typename in ('float', 'double', 'long double'))
- assert S + U + F + C == 1 # one and only one of them is true
- assert I == (S or U)
+ assert I + F + C == 1 # one and only one of them is true
def test_all_integer_and_float_types():
typenames = []
@@ -208,7 +207,7 @@
def test_var_signed_integer_types():
ffi = FFI()
- lst = all_signed_integer_types
+ lst = all_signed_integer_types(ffi)
csource = "\n".join(["%s somevar_%s;" % (tp, tp.replace(' ', '_'))
for tp in lst])
ffi.cdef(csource)
@@ -227,7 +226,7 @@
def test_var_unsigned_integer_types():
ffi = FFI()
- lst = all_unsigned_integer_types
+ lst = all_unsigned_integer_types(ffi)
csource = "\n".join(["%s somevar_%s;" % (tp, tp.replace(' ', '_'))
for tp in lst])
ffi.cdef(csource)
@@ -248,7 +247,7 @@
def test_fn_signed_integer_types():
ffi = FFI()
- lst = all_signed_integer_types
+ lst = all_signed_integer_types(ffi)
cdefsrc = "\n".join(["%s somefn_%s(%s);" % (tp, tp.replace(' ', '_'), tp)
for tp in lst])
ffi.cdef(cdefsrc)
@@ -268,7 +267,7 @@
def test_fn_unsigned_integer_types():
ffi = FFI()
- lst = all_unsigned_integer_types
+ lst = all_unsigned_integer_types(ffi)
cdefsrc = "\n".join(["%s somefn_%s(%s);" % (tp, tp.replace(' ', '_'), tp)
for tp in lst])
ffi.cdef(cdefsrc)
@@ -465,11 +464,12 @@
def test_struct_float_vs_int():
if sys.platform == 'win32':
py.test.skip("XXX fixme: only gives warnings")
- for typename in all_signed_integer_types:
+ ffi = FFI()
+ for typename in all_signed_integer_types(ffi):
for real in all_float_types:
_check_field_match(typename, real, expect_mismatch=True)
for typename in all_float_types:
- for real in all_signed_integer_types:
+ for real in all_signed_integer_types(ffi):
_check_field_match(typename, real, expect_mismatch=True)
def test_struct_array_field():
@@ -1134,6 +1134,9 @@
xxx
def test_opaque_integer_as_function_result():
+ import platform
+ if platform.machine().startswith('sparc'):
+ py.test.skip('Breaks horribly on sparc (SIGILL + corrupted stack)')
# XXX bad abuse of "struct { ...; }". It only works a bit by chance
# anyway. XXX think about something better :-(
ffi = FFI()
@@ -1856,3 +1859,24 @@
def test_various_calls_libffi():
_test_various_calls(force_libffi=True)
+
+def test_ptr_to_opaque():
+ ffi = FFI()
+ ffi.cdef("typedef ... foo_t; int f1(foo_t*); foo_t *f2(int);")
+ lib = ffi.verify("""
+ #include <stdlib.h>
+ typedef struct { int x; } foo_t;
+ int f1(foo_t* p) {
+ int x = p->x;
+ free(p);
+ return x;
+ }
+ foo_t *f2(int x) {
+ foo_t *p = malloc(sizeof(foo_t));
+ p->x = x;
+ return p;
+ }
+ """)
+ p = lib.f2(42)
+ x = lib.f1(p)
+ assert x == 42
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_version.py b/pypy/module/test_lib_pypy/cffi_tests/test_version.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_version.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_version.py
@@ -10,7 +10,8 @@
'0.4.2': '0.4', # did not change
'0.7.1': '0.7', # did not change
'0.7.2': '0.7', # did not change
- '0.8.1': '0.8', # did not change
+ '0.8.1': '0.8', # did not change (essentially)
+ '0.8.2': '0.8', # did not change
}
def test_version():
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
@@ -26,7 +26,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
v.write_source()
with open(v.sourcefilename, 'r') as f:
data = f.read()
@@ -36,7 +37,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
v.sourcefilename = filename = str(udir.join('write_source.c'))
v.write_source()
assert filename == v.sourcefilename
@@ -48,7 +50,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
try:
from StringIO import StringIO
except ImportError:
@@ -61,7 +64,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
v.compile_module()
assert v.get_module_name().startswith('_cffi_')
if v.generates_python_module():
@@ -72,7 +76,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!2*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
basename = self.__class__.__name__ + 'test_compile_module'
v.modulefilename = filename = str(udir.join(basename + '.so'))
v.compile_module()
@@ -88,7 +93,8 @@
ffi = FFI()
ffi.cdef("%s sin(double x);" % csrc)
v = Verifier(ffi, "#include <math.h>",
- force_generic_engine=self.generic)
+ force_generic_engine=self.generic,
+ libraries=["m"])
names.append(v.get_module_name())
assert names[0] == names[1] != names[2]
@@ -105,7 +111,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there %s!3*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
library = v.load_library()
assert library.sin(12.3) == math.sin(12.3)
@@ -115,7 +122,8 @@
csrc = '/*hi there %s!4*/#include "test_verifier_args.h"\n' % self
udir.join('test_verifier_args.h').write('#include <math.h>\n')
v = Verifier(ffi, csrc, include_dirs=[str(udir)],
- force_generic_engine=self.generic)
+ force_generic_engine=self.generic,
+ libraries=["m"])
library = v.load_library()
assert library.sin(12.3) == math.sin(12.3)
@@ -123,7 +131,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = "/*6%s*/\n#include <math.h>" % self
- lib = ffi.verify(csrc, force_generic_engine=self.generic)
+ lib = ffi.verify(csrc, force_generic_engine=self.generic,
+ libraries=["m"])
assert lib.sin(12.3) == math.sin(12.3)
assert isinstance(ffi.verifier, Verifier)
with open(ffi.verifier.sourcefilename, 'r') as f:
@@ -140,7 +149,8 @@
#endif
'''
lib = ffi.verify(csrc, define_macros=[('TEST_EXTENSION_OBJECT', '1')],
- force_generic_engine=self.generic)
+ force_generic_engine=self.generic,
+ libraries=["m"])
assert lib.sin(12.3) == math.sin(12.3)
v = ffi.verifier
ext = v.get_extension()
@@ -153,7 +163,8 @@
ffi = FFI()
ffi.cdef("double sin(double x);")
csrc = '/*hi there9!%s*/\n#include <math.h>\n' % self
- v = Verifier(ffi, csrc, force_generic_engine=self.generic)
+ v = Verifier(ffi, csrc, force_generic_engine=self.generic,
+ libraries=["m"])
assert not os.path.exists(v.sourcefilename)
v.get_extension()
assert os.path.exists(v.sourcefilename)
More information about the pypy-commit
mailing list