Author: Armin Rigo <[email protected]>
Branch: cffi-1.0
Changeset: r1819:4744cc882ca2
Date: 2015-04-25 12:13 +0200
http://bitbucket.org/cffi/cffi/changeset/4744cc882ca2/
Log: fix/skip
diff --git a/_cffi1/recompiler.py b/_cffi1/recompiler.py
--- a/_cffi1/recompiler.py
+++ b/_cffi1/recompiler.py
@@ -760,9 +760,8 @@
import imp
assert module_name not in sys.modules, "module name conflict: %r" % (
module_name,)
- outputfilename = recompile(ffi, module_name, preamble,
- tmpdir=str(udir),
- *args, **kwds)
+ kwds.setdefault('tmpdir', str(udir))
+ outputfilename = recompile(ffi, module_name, preamble, *args, **kwds)
module = imp.load_dynamic(module_name, outputfilename)
#
# hack hack hack: copy all *bound methods* from module.ffi back to the
diff --git a/_cffi1/test_verify1.py b/_cffi1/test_verify1.py
--- a/_cffi1/test_verify1.py
+++ b/_cffi1/test_verify1.py
@@ -27,12 +27,11 @@
_verify_counter = 0
def verify(self, preamble='', *args, **kwds):
- from _cffi1.udir import udir
FFI._verify_counter += 1
return recompiler.verify(self, 'verify%d' % FFI._verify_counter,
preamble, *args,
extra_compile_args=self._extra_compile_args,
- tmp=str(udir), **kwds)
+ **kwds)
class FFI_warnings_not_error(FFI):
_extra_compile_args = []
@@ -1390,6 +1389,7 @@
assert lib.foo(100) == 142
def test_relative_to():
+ py.test.skip("not available")
import tempfile, os
from testing.udir import udir
tmpdir = tempfile.mkdtemp(dir=str(udir))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
