[pypy-commit] pypy kill-someobject: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: kill-someobject
Changeset: r58048:b6bfa9703196
Date: 2012-10-12 16:24 +0200
http://bitbucket.org/pypy/pypy/changeset/b6bfa9703196/

Log:	merge heads

diff --git a/pypy/rlib/test/test_rmmap.py b/pypy/rlib/test/test_rmmap.py
--- a/pypy/rlib/test/test_rmmap.py
+++ b/pypy/rlib/test/test_rmmap.py
@@ -426,7 +426,7 @@
             m.close()
             return r
 
-        compile(func, [int])
+        compile(func, [int], gcpolicy='boehm')
 
     def test_windows_crasher_1(self):
         if sys.platform != "win32":
@@ -469,5 +469,5 @@
 def test_compile_alloc_free():
     from pypy.translator.c.test.test_genc import compile
 
-    fn = compile(test_alloc_free, [])
+    fn = compile(test_alloc_free, [], gcpolicy='boehm')
     fn()
diff --git a/pypy/rlib/test/test_rstruct.py b/pypy/rlib/test/test_rstruct.py
--- a/pypy/rlib/test/test_rstruct.py
+++ b/pypy/rlib/test/test_rstruct.py
@@ -43,9 +43,15 @@
         def pack(x):
             result = []
             ieee.pack_float(result, x, 8, False)
-            return ''.join(result)
+            l = []
+            for x in result:
+                for c in x:
+                    l.append(str(ord(c)))
+            return ','.join(l)
         c_pack = compile(pack, [float])
         def unpack(s):
+            l = s.split(',')
+            s = ''.join([chr(int(x)) for x in l])
             return ieee.unpack_float(s, False)
         c_unpack = compile(unpack, [str])
 
diff --git a/pypy/rlib/test/test_timer.py b/pypy/rlib/test/test_timer.py
--- a/pypy/rlib/test/test_timer.py
+++ b/pypy/rlib/test/test_timer.py
@@ -23,4 +23,4 @@
 def test_compile_timer():
     policy = AnnotatorPolicy()
     f_compiled = compile(timer_user, [], annotatorpolicy=policy)
-    f_compiled(expected_extra_mallocs=2)
+    f_compiled()