[pypy-commit] pypy default: Oups, sorry. Fix two tests failing in backend/x86/test/.

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r68578:f29b84b521b6
Date: 2014-01-02 01:11 +0100
http://bitbucket.org/pypy/pypy/changeset/f29b84b521b6/

Log:    Oups, sorry. Fix two tests failing in backend/x86/test/.

diff --git a/rpython/jit/metainterp/test/test_dict.py 
b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -5,6 +5,10 @@
 from collections import OrderedDict
 
 class DictTests:
+    @staticmethod
+    def newdict():   # overridden in TestLLOrderedDict
+        return {}
+
     def _freeze_(self):
         return True
 
@@ -191,9 +195,7 @@
 
 
 class TestLLtype(DictTests, LLJitMixin):
-    @staticmethod
-    def newdict():
-        return {}
+    pass
 
 class TestLLOrderedDict(DictTests, LLJitMixin):
     @staticmethod
diff --git a/rpython/jit/metainterp/test/test_rawmem.py 
b/rpython/jit/metainterp/test/test_rawmem.py
--- a/rpython/jit/metainterp/test/test_rawmem.py
+++ b/rpython/jit/metainterp/test/test_rawmem.py
@@ -71,7 +71,11 @@
                                        'raw_store': 1, 'raw_load': 1,
                                        'finish': 1})
 
+
+class TestRawMem(RawMemTests, LLJitMixin):
+
     def test_getarraysubstruct(self):
+        # NOTE: not for backend/*/test
         A2 = lltype.Array(('a', lltype.Signed), ('b', lltype.Signed),
                           hints={'nolength': True})
         p = lltype.malloc(A2, 10, flavor='raw', immortal=True, zero=True)
@@ -90,6 +94,3 @@
         assert res == 66
         res = self.interp_operations(f, [2, 2], disable_optimizations=True)
         assert res == 44
-
-class TestRawMem(RawMemTests, LLJitMixin):
-    pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit