Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r53814:919a11836ae4
Date: 2012-03-19 15:40 -0500
http://bitbucket.org/pypy/pypy/changeset/919a11836ae4/
Log: remerge branch
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
@@ -1618,8 +1618,9 @@
assert res == -19
def test_convert_float_bytes(self):
+ t = 'int' if longlong.is_64_bit else 'float'
res = self.execute_operation(rop.CONVERT_FLOAT_BYTES_TO_LONGLONG,
- [boxfloat(2.5)], 'int').value
+ [boxfloat(2.5)], t).value
assert res == longlong2float.float2longlong(2.5)
def test_ooops_non_gc(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
