[pypy-commit] pypy ffi-backend: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: ffi-backend
Changeset: r56628:59cb2c2f690f
Date: 2012-08-07 11:20 +0200
http://bitbucket.org/pypy/pypy/changeset/59cb2c2f690f/

Log:	merge heads

diff --git a/pypy/module/_cffi_backend/test/_backend_test_c.py b/pypy/module/_cffi_backend/test/_backend_test_c.py
--- a/pypy/module/_cffi_backend/test/_backend_test_c.py
+++ b/pypy/module/_cffi_backend/test/_backend_test_c.py
@@ -1290,7 +1290,8 @@
     BArray = new_array_type(new_pointer_type(BByte), None)
     a = newp(BArray, [65, 66, 67])
     assert type(string(a)) is str and string(a) == 'ABC'
-    assert string(a, 8).startswith('ABC')   # may contain additional garbage
+    if 'PY_DOT_PY' not in globals():
+        assert string(a, 8).startswith('ABC')  # may contain additional garbage
 
 def test_string_wchar():
     BWChar = new_primitive_type("wchar_t")
@@ -1300,7 +1301,8 @@
     BArray = new_array_type(new_pointer_type(BWChar), None)
     a = newp(BArray, [u'A', u'B', u'C'])
     assert type(string(a)) is unicode and string(a) == u'ABC'
-    assert string(a, 8).startswith(u'ABC')  # may contain additional garbage
+    if 'PY_DOT_PY' not in globals():
+        assert string(a, 8).startswith(u'ABC') # may contain additional garbage
 
 def test_string_typeerror():
     BShort = new_primitive_type("short")
diff --git a/pypy/module/_cffi_backend/test/test_ztranslation.py b/pypy/module/_cffi_backend/test/test_ztranslation.py
--- a/pypy/module/_cffi_backend/test/test_ztranslation.py
+++ b/pypy/module/_cffi_backend/test/test_ztranslation.py
@@ -1,4 +1,8 @@
 from pypy.objspace.fake.checkmodule import checkmodule
 
+# side-effect: FORMAT_LONGDOUBLE must be built before test_checkmodule()
+from pypy.module._cffi_backend import misc
+
+
 def test_checkmodule():
     checkmodule('_cffi_backend')