[pypy-commit] pypy jit-targets: fix tests

hakanardo noreply at buildbot.pypy.org
Sun Dec 4 12:54:02 CET 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r50113:34216d424b05
Date: 2011-12-04 12:53 +0100
http://bitbucket.org/pypy/pypy/changeset/34216d424b05/

Log:	fix tests

diff --git a/pypy/module/pypyjit/test_pypy_c/test_instance.py b/pypy/module/pypyjit/test_pypy_c/test_instance.py
--- a/pypy/module/pypyjit/test_pypy_c/test_instance.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_instance.py
@@ -27,7 +27,7 @@
             i9 = int_add_ovf(i5, 2)
             guard_no_overflow(descr=...)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i9, i6, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i9, i6, descr=...)
         """)
 
     def test_load_attr(self):
@@ -52,7 +52,7 @@
             i10 = int_add_ovf(i5, i7)
             guard_no_overflow(descr=...)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i10, i6, i7, p8, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i10, i6, i7, p8, descr=...)
         """)
 
     def test_getattr_with_dynamic_attribute(self):
@@ -125,9 +125,9 @@
             i12 = force_token()
             --TICK--
             p20 = new_with_vtable(ConstClass(W_IntObject))
+            setfield_gc(p20, i11, descr=<SignedFieldDescr.*W_IntObject.inst_intval .*>)
             setfield_gc(ConstPtr(ptr21), p20, descr=<GcPtrFieldDescr .*TypeCell.inst_w_value .*>)
-            setfield_gc(p20, i11, descr=<SignedFieldDescr.*W_IntObject.inst_intval .*>)
-            jump(p0, p1, p2, p3, p4, p20, p6, i7, p20, descr=<Loop.>)
+            jump(p0, p1, p2, p3, p4, p20, p6, i7, p20, descr=...)
         """)
 
     def test_oldstyle_newstyle_mix(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_intbound.py b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
--- a/pypy/module/pypyjit/test_pypy_c/test_intbound.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
@@ -97,7 +97,7 @@
             guard_no_overflow(descr=...)
             i17 = int_add(i8, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i14, i12, i17, p8, i9, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i14, i12, i17, p8, i9, descr=...)
         """)
 
     def test_intbound_sub_lt(self):
@@ -121,7 +121,7 @@
             guard_no_overflow(descr=...)
             i13 = int_add(i5, 1)
             --TICK--
-            jump(p0, p1, p2, p3, i11, i13, descr=<Loop0>)
+            jump(p0, p1, p2, p3, i11, i13, descr=...)
         """)
 
     def test_intbound_addsub_ge(self):
@@ -150,7 +150,7 @@
             guard_no_overflow(descr=...)
             i19 = int_add(i8, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i16, i14, i19, p8, i9, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i16, i14, i19, p8, i9, descr=...)
         """)
 
     def test_intbound_addmul_ge(self):
@@ -178,7 +178,7 @@
             guard_no_overflow(descr=...)
             i21 = int_add(i8, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i18, i14, i21, p8, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i18, i14, i21, p8, descr=...)
         """)
 
     def test_intbound_eq(self):
@@ -210,7 +210,7 @@
             guard_no_overflow(descr=...)
             i16 = int_add(i8, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, p6, i14, i16, p8, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, p6, i14, i16, p8, descr=...)
         """)
 
     def test_intbound_mul(self):
@@ -236,7 +236,7 @@
             guard_no_overflow(descr=...)
             i14 = int_add(i6, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i12, i14, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i12, i14, descr=...)
         """)
 
     def test_assert(self):
@@ -257,7 +257,7 @@
             guard_no_overflow(descr=...)
             i12 = int_add(i6, 1)
             --TICK--
-            jump(p0, p1, p2, p3, p4, i10, i12, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, i10, i12, descr=...)
         """)
 
     def test_xor(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_math.py b/pypy/module/pypyjit/test_pypy_c/test_math.py
--- a/pypy/module/pypyjit/test_pypy_c/test_math.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_math.py
@@ -29,7 +29,7 @@
             f5 = float_add(f0, f4)
             i4 = int_add(i0, 1)
             --TICK--
-            jump(..., descr=<Loop0>)
+            jump(..., descr=...)
         """)
 
     def test_sin_cos(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_min_max.py b/pypy/module/pypyjit/test_pypy_c/test_min_max.py
--- a/pypy/module/pypyjit/test_pypy_c/test_min_max.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_min_max.py
@@ -22,7 +22,7 @@
             guard_no_overflow(descr=...)
             i11 = int_add(i4, 1)
             --TICK--
-            jump(p0, p1, p2, p3, i11, i9, descr=<Loop0>)
+            jump(p0, p1, p2, p3, i11, i9, descr=...)
         """)
 
     def test_silly_max(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py b/pypy/module/pypyjit/test_pypy_c/test_misc.py
--- a/pypy/module/pypyjit/test_pypy_c/test_misc.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_misc.py
@@ -88,7 +88,7 @@
             guard_true(i9, descr=...)
             f10 = float_add(f8, f5)
             --TICK--
-            jump(p0, p1, p2, p3, p4, f10, p6, f7, f8, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, f10, p6, f7, f8, descr=...)
         """)
 
 
@@ -159,7 +159,7 @@
             i27 = int_add_ovf(i7, i18)
             guard_no_overflow(descr=...)
             --TICK--
-            jump(..., descr=<Loop0>)
+            jump(..., descr=...)
         """)
 
 
@@ -219,7 +219,7 @@
             i28 = int_add_ovf(i10, i25)
             guard_no_overflow(descr=...)
             --TICK--
-            jump(p0, p1, p2, p3, p4, p5, p6, i28, i25, p9, p10, p11, p12, i19, descr=<Loop0>)
+            jump(p0, p1, p2, p3, p4, p5, p6, i28, i25, p9, p10, p11, p12, i19, descr=...)
         """)
 
 


More information about the pypy-commit mailing list