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

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: ffi-backend
Changeset: r56661:7770b00a9605
Date: 2012-08-08 23:54 +0200
http://bitbucket.org/pypy/pypy/changeset/7770b00a9605/

Log:	merge heads

diff --git a/pypy/module/pypyjit/test_pypy_c/test__ffi.py b/pypy/module/pypyjit/test_pypy_c/test__ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test__ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test__ffi.py
@@ -201,7 +201,11 @@
         loop, = log.loops_by_filename(self.filepath)
         if 'ConstClass(pow)' in repr(loop):   # e.g. OS/X
             pow_addr = 'ConstClass(pow)'
-        py.test.xfail()     # XXX currently too much code, fixme
         assert loop.match_by_id('cfficall', """
             ...
-        """ % pow_addr)
+            f1 = call_release_gil(..., descr=<Callf 8 ff EF=6 OS=62>)
+            ...
+        """)
+        # so far just check that call_release_gil() is produced.
+        # later, also check that the arguments to call_release_gil()
+        # are constants, and that the numerous raw_mallocs are removed