[pypy-commit] pypy s390x-backend: fixed some tests

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: s390x-backend
Changeset: r82806:f563f1ea7c20
Date: 2016-03-06 10:21 +0100
http://bitbucket.org/pypy/pypy/changeset/f563f1ea7c20/

Log:	fixed some tests

diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -315,11 +315,9 @@
                                   'strdescr': arraydescr})
         # check the returned pointers
         gc_ll_descr = self.cpu.gc_ll_descr
-        scale = lambda x: x if x in self.cpu.load_supported_factors else 1
-        byte = lambda f,v: v if scale(f) != 1 else v*f
-        assert gc_ll_descr.calls == [(scale(8), 15, byte(8,10)),
-                                     (scale(5), 15, byte(5,3)),
-                                     ('str', byte(5,3))]
+        assert gc_ll_descr.calls == [(8, 15, 10),
+                                     (5, 15, 3),
+                                     ('str', 3)]
         # one fit, one was too large, one was not fitting
 
     def test_malloc_slowpath(self):
diff --git a/rpython/jit/backend/zarch/test/test_zrpy_gc_hypo.py b/rpython/jit/backend/zarch/test/test_zrpy_gc_hypo.py
deleted file mode 100644
--- a/rpython/jit/backend/zarch/test/test_zrpy_gc_hypo.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from rpython.jit.backend.llsupport.tl.test.zrpy_gc_hypo_test import GCHypothesis
-
-import py
-
-py.test.skip("not yet working")
-
-class TestGCHypothesis(GCHypothesis):
-    # runs ../../llsupport/tl/test/zrpy_gc_hypo_test.py
-    gcrootfinder = "shadowstack"
-    gc = "incminimark"
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -28,6 +28,7 @@
 
 
 def setup():
+    from rpython.jit.backend import detect_cpu
     if detect_cpu.autodetect().startswith(detect_cpu.MODEL_S390_64):
         raise VMProfPlatformUnsupported("rvmprof not supported on"
                                         " s390x CPUs for now")