Author: David Schneider <david.schnei...@picle.org>
Branch: arm-backend-2
Changeset: r56642:bbc9f161f31c
Date: 2012-08-07 17:40 +0200
http://bitbucket.org/pypy/pypy/changeset/bbc9f161f31c/
Log: merge default
diff --git a/pypy/jit/backend/arm/test/test_ztranslation.py
b/pypy/jit/backend/arm/test/test_ztranslation.py
--- a/pypy/jit/backend/arm/test/test_ztranslation.py
+++ b/pypy/jit/backend/arm/test/test_ztranslation.py
@@ -176,6 +176,7 @@
assert bound & (bound-1) == 0 # a power of two
def test_jit_get_stats(self):
+ py.test.xfail()
driver = JitDriver(greens = [], reds = ['i'])
def f():
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
@@ -2730,13 +2730,14 @@
assert str.chars[4] == '/'
def test_sorting_of_fields(self):
- S = self.S
+ S = lltype.GcStruct('S', ('parent', rclass.OBJECT),
+ ('value', lltype.Signed),
+ ('chr1', lltype.Char),
+ ('chr2', lltype.Char))
+ chr1 = self.cpu.fielddescrof(S, 'chr1').sort_key()
value = self.cpu.fielddescrof(S, 'value').sort_key()
- chr1 = self.cpu.fielddescrof(S, 'chr1').sort_key()
chr2 = self.cpu.fielddescrof(S, 'chr2').sort_key()
- assert (sorted([chr2, chr1, value]) ==
- [value, chr1, chr2])
- assert len(dict.fromkeys([value, chr1, chr2]).keys()) == 3
+ assert len(set([value, chr1, chr2])) == 3
def test_guards_nongc(self):
x = lltype.malloc(lltype.Struct('x'), flavor='raw')
diff --git a/pypy/jit/backend/x86/test/test_ztranslation.py
b/pypy/jit/backend/x86/test/test_ztranslation.py
--- a/pypy/jit/backend/x86/test/test_ztranslation.py
+++ b/pypy/jit/backend/x86/test/test_ztranslation.py
@@ -172,6 +172,7 @@
assert bound & (bound-1) == 0 # a power of two
def test_jit_get_stats(self):
+ py.test.xfail()
driver = JitDriver(greens = [], reds = ['i'])
def f():
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
