[pypy-commit] pypy ppc-jit-backend: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: ppc-jit-backend
Changeset: r56401:51132a44ec94
Date: 2012-07-23 01:18 -0700
http://bitbucket.org/pypy/pypy/changeset/51132a44ec94/

Log:	merge heads

diff --git a/pypy/jit/backend/x86/test/test_del.py b/pypy/jit/backend/ppc/test/test_del.py
copy from pypy/jit/backend/x86/test/test_del.py
copy to pypy/jit/backend/ppc/test/test_del.py
--- a/pypy/jit/backend/x86/test/test_del.py
+++ b/pypy/jit/backend/ppc/test/test_del.py
@@ -1,8 +1,8 @@
 
-from pypy.jit.backend.x86.test.test_basic import Jit386Mixin
+from pypy.jit.backend.ppc.test.support import JitPPCMixin
 from pypy.jit.metainterp.test.test_del import DelTests
 
-class TestDel(Jit386Mixin, DelTests):
+class TestDel(JitPPCMixin, DelTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_del.py
     pass
diff --git a/pypy/jit/backend/x86/test/test_dict.py b/pypy/jit/backend/ppc/test/test_dict.py
copy from pypy/jit/backend/x86/test/test_dict.py
copy to pypy/jit/backend/ppc/test/test_dict.py
--- a/pypy/jit/backend/x86/test/test_dict.py
+++ b/pypy/jit/backend/ppc/test/test_dict.py
@@ -1,9 +1,9 @@
 
-from pypy.jit.backend.x86.test.test_basic import Jit386Mixin
+from pypy.jit.backend.ppc.test.support import JitPPCMixin
 from pypy.jit.metainterp.test.test_dict import DictTests
 
 
-class TestDict(Jit386Mixin, DictTests):
+class TestDict(JitPPCMixin, DictTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_dict.py
     pass