[pypy-commit] pypy kill-someobject: fix test_symbolic

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: kill-someobject
Changeset: r58054:733a234965d2
Date: 2012-10-12 16:43 +0200
http://bitbucket.org/pypy/pypy/changeset/733a234965d2/

Log:    fix test_symbolic

diff --git a/pypy/translator/c/test/test_symbolic.py 
b/pypy/translator/c/test/test_symbolic.py
--- a/pypy/translator/c/test/test_symbolic.py
+++ b/pypy/translator/c/test/test_symbolic.py
@@ -1,15 +1,9 @@
 from pypy.translator.interactive import Translation
+from pypy.translator.c.test.test_genc import compile
 from pypy import conftest
 from pypy.rpython.lltypesystem import llmemory, lltype
 from pypy.rlib.objectmodel import ComputedIntSymbolic
 
-def getcompiled(f, args):
-    t = Translation(f, args)
-    fn = t.compile_c()
-    if conftest.option.view:
-        t.view()
-    return fn, t
-
 def test_offsetof():
     STRUCT = lltype.GcStruct("s", ("x", lltype.Signed), ("y", lltype.Signed))
     offsetx = llmemory.offsetof(STRUCT, 'x')
@@ -21,7 +15,7 @@
         result = (adr + offsetx).signed[0]
         (adr + offsety).signed[0] = 2
         return result * 10 + s.y
-    fn, t = getcompiled(f, [])
+    fn = compile(f, [])
     res = fn()
     assert res == 12
 
@@ -31,7 +25,7 @@
     signedsize = llmemory.sizeof(lltype.Signed)
     def f():
         return arraysize-signedsize*10
-    fn, t = getcompiled(f, [])
+    fn = compile(f, [])
     res = fn()
     assert res == 0
 
@@ -51,7 +45,7 @@
         for i in range(5):
             result = 10 * result + a[i]
         return result
-    fn, t = getcompiled(f, [])
+    fn = compile(f, [])
     res = fn()
     assert res == 1234501234
 
@@ -71,7 +65,7 @@
         for i in range(5):
             result = 10 * result + a[i]
         return result
-    fn, t = getcompiled(f, [])
+    fn = compile(f, [])
     res = fn()
     assert res == 1234501234
 
@@ -88,7 +82,7 @@
         result = (adr + offsety).signed[0] * 10 + int(offsety < sizeofs)
         llmemory.raw_free(adr)
         return result
-    fn, t = getcompiled(f, [])
+    fn = compile(f, [])
     res = fn()
     assert res == 51
 
@@ -98,7 +92,7 @@
         assert not too_early
         return 7
     k = ComputedIntSymbolic(compute_fn)
-    def f():
+    def f(ignored):
         return k*6
 
     t = Translation(f)
@@ -106,6 +100,6 @@
     if conftest.option.view:
         t.view()
     too_early = False
-    fn = t.compile_c()
-    res = fn()
+    fn = compile(f, [int])
+    res = fn(0)
     assert res == 42
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit