Commits

Armin Rigo committed b6bfa97 Merge

merge heads

Comments (0)

Files changed (3)

pypy/rlib/test/test_rmmap.py

             m.close()
             return r
 
-        compile(func, [int])
+        compile(func, [int], gcpolicy='boehm')
 
     def test_windows_crasher_1(self):
         if sys.platform != "win32":
 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()

pypy/rlib/test/test_rstruct.py

         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])
 

pypy/rlib/test/test_timer.py

 def test_compile_timer():
     policy = AnnotatorPolicy()
     f_compiled = compile(timer_user, [], annotatorpolicy=policy)
-    f_compiled(expected_extra_mallocs=2)
+    f_compiled()