Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r73878:aab89610d3d8
Date: 2014-10-10 00:24 -0400
http://bitbucket.org/pypy/pypy/changeset/aab89610d3d8/
Log: fix tests on 32bit
diff --git a/pypy/module/micronumpy/test/test_arrayops.py
b/pypy/module/micronumpy/test/test_arrayops.py
--- a/pypy/module/micronumpy/test/test_arrayops.py
+++ b/pypy/module/micronumpy/test/test_arrayops.py
@@ -207,7 +207,7 @@
exc = raises(TypeError, np.result_type, a=2)
assert str(exc.value) == "result_type() takes no keyword arguments"
assert np.result_type(True) is np.dtype('bool')
- assert np.result_type(1) is np.dtype('int64')
+ assert np.result_type(1) is np.dtype('int')
assert np.result_type(1.) is np.dtype('float64')
assert np.result_type(1+2j) is np.dtype('complex128')
assert np.result_type(1, 1.) is np.dtype('float64')
diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
--- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
@@ -101,8 +101,8 @@
f149 = raw_load(i100, i129, descr=<ArrayF 8>)
p150 = getfield_gc_pure(p123, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
i151 = int_add(i117, 1)
- setarrayitem_gc(p150, 1, 0, descr=<ArrayS 8>)
- setarrayitem_gc(p150, 0, 0, descr=<ArrayS 8>)
+ setarrayitem_gc(p150, 1, 0, descr=<ArrayS .+>)
+ setarrayitem_gc(p150, 0, 0, descr=<ArrayS .+>)
guard_not_invalidated(descr=...)
i154 = getfield_raw(ticker_address, descr=<FieldS
pypysig_long_struct.c_value 0>)
i155 = int_lt(i154, 0)
@@ -143,8 +143,8 @@
p152 = getfield_gc_pure(p126, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst_indices .+>)
i153 = int_add(i120, 1)
i154 = getfield_raw(ticker_address, descr=<FieldS
pypysig_long_struct.c_value 0>)
- setarrayitem_gc(p152, 1, 0, descr=<ArrayS 8>)
- setarrayitem_gc(p152, 0, 0, descr=<ArrayS 8>)
+ setarrayitem_gc(p152, 1, 0, descr=<ArrayS .+>)
+ setarrayitem_gc(p152, 0, 0, descr=<ArrayS .+>)
i157 = int_lt(i154, 0)
guard_false(i157, descr=...)
p158 = new_with_vtable(...)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
