Author: Armin Rigo <[email protected]>
Branch:
Changeset: r90887:efad75426201
Date: 2017-04-01 10:43 +0200
http://bitbucket.org/pypy/pypy/changeset/efad75426201/
Log: The exact message we get depends on the underlying (host) cffi
version
diff --git a/pypy/module/_cffi_backend/test/test_recompiler.py
b/pypy/module/_cffi_backend/test/test_recompiler.py
--- a/pypy/module/_cffi_backend/test/test_recompiler.py
+++ b/pypy/module/_cffi_backend/test/test_recompiler.py
@@ -1471,8 +1471,13 @@
with self.StdErrCapture(fd=True) as f:
res = lib.bar(4, 5)
assert res == 0
- assert f.getvalue() == (
+ assert f.getvalue() in (
+ # If the underlying cffi is <= 1.9
"extern \"Python\": function bar() called, but no code was
attached "
+ "to it yet with @ffi.def_extern(). Returning 0.\n",
+ # If the underlying cffi is >= 1.10
+ "extern \"Python\": function _CFFI_test_extern_python_1.bar() "
+ "called, but no code was attached "
"to it yet with @ffi.def_extern(). Returning 0.\n")
@ffi.def_extern("bar")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
