[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r45509:4480dd03bc6a
Date: 2011-07-12 13:39 +0200
http://bitbucket.org/pypy/pypy/changeset/4480dd03bc6a/

Log:	merge heads

diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
@@ -134,13 +134,12 @@
 
 
     def test_truncate_python_longs(self):
-        py.test.skip("fixme")
         f = dll._testfunc_i_bhilfd
         f.argtypes = [c_byte, c_short, c_int, c_long, c_float, c_double]
         f.restype = c_int
         x = sys.maxint * 2
-        result = f(0, 0, x, 0, 0, 0)
-        assert result == 2
+        result = f(x, x, x, x, 0, 0)
+        assert result == -8
 
 
     def test_floatresult(self):