Author: David Schneider <david.schnei...@picle.org>
Branch: arm-backend-2
Changeset: r45562:8c2c5a276c71
Date: 2011-07-13 17:04 +0200
http://bitbucket.org/pypy/pypy/changeset/8c2c5a276c71/
Log: fix tests
diff --git a/pypy/jit/backend/arm/test/test_zrpy_gc.py
b/pypy/jit/backend/arm/test/test_zrpy_gc.py
--- a/pypy/jit/backend/arm/test/test_zrpy_gc.py
+++ b/pypy/jit/backend/arm/test/test_zrpy_gc.py
@@ -10,13 +10,10 @@
from pypy.rlib import rgc
from pypy.rpython.lltypesystem import lltype, llmemory, rffi
from pypy.rlib.jit import JitDriver, dont_look_inside
-from pypy.jit.backend.arm.runner import ArmCPU
-from pypy.jit.backend.llsupport.gc import GcRefList, GcRootMap_asmgcc
from pypy.rlib.jit import elidable, unroll_safe
from pypy.jit.backend.llsupport.gc import GcLLDescr_framework
from pypy.tool.udir import udir
from pypy.config.translationoption import DEFL_GC
-import py.test
class X(object):
def __init__(self, x=0):
@@ -684,3 +681,4 @@
class TestShadowStack(CompileFrameworkTests):
gcrootfinder = "shadowstack"
+
diff --git a/pypy/jit/backend/test/runner_test.py
b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -2737,7 +2737,7 @@
assert False, 'should not be called'
from pypy.jit.codewriter.effectinfo import EffectInfo
- effectinfo = EffectInfo([], [], [], EffectInfo.EF_CAN_RAISE,
EffectInfo.OS_MATH_SQRT)
+ effectinfo = EffectInfo([], [], [], [], EffectInfo.EF_CAN_RAISE,
EffectInfo.OS_MATH_SQRT)
FPTR = self.Ptr(self.FuncType([lltype.Float], lltype.Float))
func_ptr = llhelper(FPTR, math_sqrt)
FUNC = deref(FPTR)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
