Author: fijal
Branch:
Changeset: r79965:551f1d6a8a9c
Date: 2015-10-04 10:40 +0200
http://bitbucket.org/pypy/pypy/changeset/551f1d6a8a9c/
Log: merge
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -158,7 +158,7 @@
RegrTest('test_codecs.py', core=True, usemodules='_multibytecodec'),
RegrTest('test_codeop.py', core=True),
RegrTest('test_coding.py', core=True),
- RegrTest('test_coercion.py', core=True),
+ RegrTest('test_coercion.py', core=True, usemodules='struct'),
RegrTest('test_collections.py', usemodules='binascii struct'),
RegrTest('test_colorsys.py'),
RegrTest('test_commands.py'),
diff --git a/rpython/jit/metainterp/test/test_fficall.py
b/rpython/jit/metainterp/test/test_fficall.py
--- a/rpython/jit/metainterp/test/test_fficall.py
+++ b/rpython/jit/metainterp/test/test_fficall.py
@@ -191,6 +191,7 @@
kwds['expected_call_release_gil_i'] =
kwds.pop('expected_call_release_gil', 1)
else:
kwds['expected_call_release_gil_f'] =
kwds.pop('expected_call_release_gil', 1)
+ kwds['expected_call_release_gil_i'] = 0
maxint32 = 2147483647
a = r_longlong(maxint32) + 1
b = r_longlong(maxint32) + 2
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
