[pypy-commit] pypy win_ffi: fix test for jit

mattip noreply at buildbot.pypy.org
Fri Jun 1 15:25:33 CEST 2012


Author: Matti Picus <matti.picus at gmail.com>
Branch: win_ffi
Changeset: r55253:8c584438b1f9
Date: 2012-05-31 23:36 +0300
http://bitbucket.org/pypy/pypy/changeset/8c584438b1f9/

Log:	fix test for jit

diff --git a/pypy/rlib/test/test_libffi.py b/pypy/rlib/test/test_libffi.py
--- a/pypy/rlib/test/test_libffi.py
+++ b/pypy/rlib/test/test_libffi.py
@@ -6,6 +6,7 @@
 from pypy.rlib.test.test_clibffi import BaseFfiTest, make_struct_ffitype_e
 from pypy.rpython.lltypesystem import rffi, lltype
 from pypy.rpython.lltypesystem.ll2ctypes import ALLOCATED
+from pypy.rpython.llinterp import LLException
 from pypy.rlib.libffi import (CDLL, ArgChain, types,
                               IS_32_BIT, array_getitem, array_setitem)
 from pypy.rlib.libffi import (struct_getfield_int, struct_setfield_int,
@@ -551,6 +552,9 @@
             except ValueError, e:
                 assert e.message == 'Procedure called with not enough ' + \
                      'arguments (8 bytes missing) or wrong calling convention'
+            except LLException:
+                #jitted code raises this
+                pass
             else:
                 assert 0, 'wrong calling convention should have raised'
 


More information about the pypy-commit mailing list