[pypy-commit] pypy kill-someobject: Fix test

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: kill-someobject
Changeset: r58040:d00679079994
Date: 2012-10-12 15:48 +0200
http://bitbucket.org/pypy/pypy/changeset/d00679079994/

Log:	Fix test

diff --git a/pypy/translator/c/test/test_genc.py b/pypy/translator/c/test/test_genc.py
--- a/pypy/translator/c/test/test_genc.py
+++ b/pypy/translator/c/test/test_genc.py
@@ -159,8 +159,17 @@
         elif ll_res == lltype.Void:
             return None
         raise NotImplementedError("parsing %s" % (ll_res,))
-    f.__name__ = fn.__name__
-    return f
+
+    class CompilationResult(object):
+        def __repr__(self):
+            return 'CompilationResult(%s)' % (fn.__name__,)
+        def __call__(self, *args, **kwds):
+            return f(*args, **kwds)
+
+    cr = CompilationResult()
+    cr.t = t
+    cr.builder = t.driver.cbuilder
+    return cr
 
 
 def test_simple():
diff --git a/pypy/translator/tool/test/test_staticsizereport.py b/pypy/translator/tool/test/test_staticsizereport.py
--- a/pypy/translator/tool/test/test_staticsizereport.py
+++ b/pypy/translator/tool/test/test_staticsizereport.py
@@ -1,8 +1,8 @@
-from pypy.translator.c.test.test_typed import CompilationTestCase
+from pypy.translator.c.test.test_genc import compile
 from pypy.translator.tool.staticsizereport import group_static_size, guess_size
 from pypy.rpython.lltypesystem import llmemory, lltype, rffi
 
-class TestStaticSizeReport(CompilationTestCase):
+class TestStaticSizeReport(object):
     def test_simple(self):
         class A:
             def __init__(self, n):
@@ -16,8 +16,9 @@
             if x:
                 return a.key
             return a.next.key
-        func = self.getcompiled(f, [int])
-        size, num = group_static_size(self.builder.db, self.builder.db.globalcontainers())
+        func = compile(f, [int])
+        size, num = group_static_size(func.builder.db,
+                                      func.builder.db.globalcontainers())
         for key, value in num.iteritems():
             if "staticsizereport.A" in str(key) and "vtable" not in str(key):
                 assert value == 101
@@ -39,8 +40,8 @@
             if x > 42:
                 dynlist.append(x)
             return d[x].x + fixlist[x] + d_small[x] + reverse_dict[test_dict[x]]
-        func = self.getcompiled(f, [int])
-        db = self.builder.db
+        func = compile(f, [int])
+        db = func.builder.db
         gcontainers = list(db.globalcontainers())
         t = db.translator
         rtyper = t.rtyper
@@ -55,11 +56,11 @@
         S = rffi.sizeof(lltype.Signed)
         P = rffi.sizeof(rffi.VOIDP)
         B = 1 # bool
-        assert guess_size(self.builder.db, dictvalnode, set()) > 100
-        assert guess_size(self.builder.db, dictvalnode2, set()) == 2 * S + 1 * P + 1 * S + 8 * (2*S + 1 * B)
+        assert guess_size(func.builder.db, dictvalnode, set()) > 100
+        assert guess_size(func.builder.db, dictvalnode2, set()) == 2 * S + 1 * P + 1 * S + 8 * (2*S + 1 * B)
         r_set = set()
         dictnode_size = guess_size(db, test_dictnode, r_set)
         assert dictnode_size == 2 * S + 1 * P + 1 * S + (4096-256) * (1*S+1*P + (1 * S + 1*P + 5)) + (8192-4096+256) * (1*S+1*P)
-        assert guess_size(self.builder.db, fixarrayvalnode, set()) == 100 * rffi.sizeof(lltype.Signed) + 1 * rffi.sizeof(lltype.Signed)
-        assert guess_size(self.builder.db, dynarrayvalnode, set()) == 100 * rffi.sizeof(lltype.Signed) + 2 * rffi.sizeof(lltype.Signed) + 1 * rffi.sizeof(rffi.VOIDP)
+        assert guess_size(func.builder.db, fixarrayvalnode, set()) == 100 * rffi.sizeof(lltype.Signed) + 1 * rffi.sizeof(lltype.Signed)
+        assert guess_size(func.builder.db, dynarrayvalnode, set()) == 100 * rffi.sizeof(lltype.Signed) + 2 * rffi.sizeof(lltype.Signed) + 1 * rffi.sizeof(rffi.VOIDP)