Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r50386:853be60223ac
Date: 2011-12-11 15:19 +0100
http://bitbucket.org/pypy/pypy/changeset/853be60223ac/
Log: hg merge default
diff --git a/pypy/module/_continuation/test/test_translated.py
b/pypy/module/_continuation/test/test_translated.py
--- a/pypy/module/_continuation/test/test_translated.py
+++ b/pypy/module/_continuation/test/test_translated.py
@@ -93,13 +93,20 @@
if not option.runappdirect:
py.test.skip("meant only for -A run")
- def test_single_threaded(self):
- for i in range(20):
- yield Runner().run_test,
-
- def test_multi_threaded(self):
- for i in range(5):
- yield multithreaded_test,
+def _setup():
+ for _i in range(20):
+ def test_single_threaded(self):
+ Runner().run_test()
+ test_single_threaded.func_name = 'test_single_threaded_%d' % _i
+ setattr(AppTestWrapper, test_single_threaded.func_name,
+ test_single_threaded)
+ for _i in range(5):
+ def test_multi_threaded(self):
+ multithreaded_test()
+ test_multi_threaded.func_name = 'test_multi_threaded_%d' % _i
+ setattr(AppTestWrapper, test_multi_threaded.func_name,
+ test_multi_threaded)
+_setup()
class ThreadTest(object):
def __init__(self, lock):
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -9,7 +9,7 @@
from pypy.rlib.unroll import unrolling_iterable
from pypy.rlib.objectmodel import instantiate, we_are_translated
from pypy.rlib.nonconst import NonConstant
-from pypy.rlib.rarithmetic import r_uint
+from pypy.rlib.rarithmetic import r_uint, r_singlefloat
from pypy.translator.translator import TranslationContext
from pypy.tool.option import make_config
@@ -145,9 +145,15 @@
self._see_interp2app(x)
if isinstance(x, GetSetProperty):
self._see_getsetproperty(x)
+ if isinstance(x, r_singlefloat):
+ self._wrap_not_rpython(x)
return w_some_obj()
wrap._annspecialcase_ = "specialize:argtype(1)"
+ def _wrap_not_rpython(self, x):
+ "NOT_RPYTHON"
+ raise NotImplementedError
+
def _see_interp2app(self, interp2app):
"NOT_RPYTHON"
activation = interp2app._code.activation
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
