Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r74859:b23bf64e6925
Date: 2014-12-09 15:06 +0000
http://bitbucket.org/pypy/pypy/changeset/b23bf64e6925/

Log:    Kill old test. Fix old test.

diff --git a/rpython/jit/metainterp/test/test_list.py 
b/rpython/jit/metainterp/test/test_list.py
--- a/rpython/jit/metainterp/test/test_list.py
+++ b/rpython/jit/metainterp/test/test_list.py
@@ -97,28 +97,6 @@
         assert res == f(10)
         self.check_resops(setarrayitem_gc=0, call=0, getarrayitem_gc=0)
 
-    def test_vlist_alloc_and_set(self):
-        # the check_loops fails, because [non-null] * n is only supported
-        # if n < 15 (otherwise it is implemented as a residual call)
-        jitdriver = JitDriver(greens = [], reds = ['n'])
-        def f(n):
-            l = [1] * 20
-            while n > 0:
-                jitdriver.can_enter_jit(n=n)
-                jitdriver.jit_merge_point(n=n)
-                l = [1] * 20
-                l[3] = 5
-                x = l[-17] + l[5] - 1
-                if n < 3:
-                    return x
-                n -= 1
-            return l[0]
-
-        res = self.meta_interp(f, [10], listops=True)
-        assert res == f(10)
-        py.test.skip("'[non-null] * n' for n >= 15 gives a residual call so 
far")
-        self.check_loops(setarrayitem_gc=0, getarrayitem_gc=0, call=0)
-
     def test_arraycopy_simpleoptimize(self):
         def f():
             l = [1, 2, 3, 4]
diff --git a/rpython/jit/metainterp/test/test_send.py 
b/rpython/jit/metainterp/test/test_send.py
--- a/rpython/jit/metainterp/test/test_send.py
+++ b/rpython/jit/metainterp/test/test_send.py
@@ -385,8 +385,7 @@
         self.check_target_token_count(4)
 
     def test_two_behaviors(self):
-        py.test.skip("XXX fix me!!!!!!! problem in optimize.py")
-        myjitdriver = JitDriver(greens = [], reds = ['x', 'y'])
+        myjitdriver = JitDriver(greens = [], reds = ['y', 'x'])
         class Int:
             def __init__(self, value):
                 self.value = value
@@ -402,11 +401,6 @@
             return x.value
         res = self.meta_interp(f, [len(cases)])
         assert res == 110
-        # The generated loops don't contain a new_with_vtable at all.  This
-        # is true if we replace "if cases[y]" above with "if not cases[y]"
-        # -- so there is no good reason that it fails.
-        self.check_loops(new_with_vtable=0)
-        self.check_trace_count(2)
 
     def test_behavior_change_after_a_while(self):
         myjitdriver = JitDriver(greens = [], reds = ['y', 'x'])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to