summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2008-07-20 12:05:41 +0000
committerPauli Virtanen <pav@iki.fi>2008-07-20 12:05:41 +0000
commit3db00b171882d289158041d630dd4b0aaf314a2d (patch)
tree9a5c48ec7d63f4efa79a8f0ba089930a7178983c /numpy
parent7a155531d0631f19b2eb6df494f0d57e2630bbd2 (diff)
downloadnumpy-3db00b171882d289158041d630dd4b0aaf314a2d.tar.gz
Fix errors in C99 tests. Skip tests failing on some platforms.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/tests/test_umath.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
index 619153cdc..a0878c730 100644
--- a/numpy/core/tests/test_umath.py
+++ b/numpy/core/tests/test_umath.py
@@ -280,17 +280,16 @@ class TestC99(object):
((-0., 0.), (-inf, pi), 'divide'),
((+0., 0.), (-inf, 0.), 'divide'),
((1., inf), (inf, pi/2), ''),
- ((1., nan), (nan, nan), ''),
+ ((1., nan), (nan, nan), 'invalid-optional'),
((-inf, 1.), (inf, pi), ''),
((inf, 1.), (inf, 0.), ''),
((-inf, inf), (inf, 3*pi/4), ''),
((inf, inf), (inf, pi/4), ''),
((inf, nan), (inf, nan), ''),
((-inf, nan), (inf, nan), ''),
- ((nan, 0.), (nan, nan), ''),
- ((nan, 1.), (nan, nan), ''),
+ ((nan, 1.), (nan, nan), 'invalid-optional'),
((nan, inf), (inf, nan), ''),
- ((+nan, nan), (nan, nan), ''),
+ ((+nan, nan), (nan, nan), 'XXX'), # raises 'invalid' on some platfs
]:
yield self._check, np.log, p, v, e
@@ -300,7 +299,7 @@ class TestC99(object):
((0., 0.), (0.,0.), ''),
((1., inf), (inf,inf), 'XXX invalid'), # now (inf, nan)
((nan, inf), (inf,inf), 'XXX'), # now (nan, nan)
- ((-inf, 1.), (0.,inf), ''),
+ ((-inf, 1.), (0.,inf), 'XXX'), # (-0., inf) on Mac OSX
((inf, 1.), (inf,0.), ''),
((-inf,nan), (nan, -inf), 'XXX'), # could also be +inf. raises 'invalid' on Sparc64
((inf, nan), (inf, nan), ''),
@@ -374,7 +373,7 @@ class TestC99(object):
((inf, nan), (0, nan), 'XXX'), # now: (nan, nan)
((nan, 1.), (nan, nan), 'invalid-optional'),
((nan, inf), (+0, pi/2), 'XXX'), # now: (nan, nan)
- ((nan, nan), (nan, nan), ''),
+ ((nan, nan), (nan, nan), 'XXX'), # raises 'invalid' on some platfs
]:
yield self._check, np.arctanh, p, v, e