summaryrefslogtreecommitdiff
path: root/numpy/testing/nose_tools/nosetester.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-08-16 14:19:17 -0500
committerGitHub <noreply@github.com>2017-08-16 14:19:17 -0500
commit26c79664d2edd48e1777cc4b31ecb952e2ec30d5 (patch)
tree0dfe2a03d716fbd8116d3d02150dc453bf741a26 /numpy/testing/nose_tools/nosetester.py
parent663094532de48e131793faaa0ba06eb7c051ab47 (diff)
parent3deb8fa4f4d25e434c86188593f95dfc2fed041c (diff)
downloadnumpy-26c79664d2edd48e1777cc4b31ecb952e2ec30d5.tar.gz
Merge pull request #9574 from pv/fpflag
BUG: deal with broken hypot() for MSVC on win32
Diffstat (limited to 'numpy/testing/nose_tools/nosetester.py')
-rw-r--r--numpy/testing/nose_tools/nosetester.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/numpy/testing/nose_tools/nosetester.py b/numpy/testing/nose_tools/nosetester.py
index 407653fc3..c2cf58377 100644
--- a/numpy/testing/nose_tools/nosetester.py
+++ b/numpy/testing/nose_tools/nosetester.py
@@ -154,7 +154,8 @@ class NoseTester(object):
want to initialize `NoseTester` objects on behalf of other code.
"""
- def __init__(self, package=None, raise_warnings="release", depth=0):
+ def __init__(self, package=None, raise_warnings="release", depth=0,
+ check_fpu_mode=False):
# Back-compat: 'None' used to mean either "release" or "develop"
# depending on whether this was a release or develop version of
# numpy. Those semantics were fine for testing numpy, but not so
@@ -191,6 +192,9 @@ class NoseTester(object):
# Set to "release" in constructor in maintenance branches.
self.raise_warnings = raise_warnings
+ # Whether to check for FPU mode changes
+ self.check_fpu_mode = check_fpu_mode
+
def _test_argv(self, label, verbose, extra_argv):
''' Generate argv for nosetest command
@@ -289,9 +293,13 @@ class NoseTester(object):
# construct list of plugins
import nose.plugins.builtin
from nose.plugins import EntryPointPluginManager
- from .noseclasses import KnownFailurePlugin, Unplugger
+ from .noseclasses import (KnownFailurePlugin, Unplugger,
+ FPUModeCheckPlugin)
plugins = [KnownFailurePlugin()]
plugins += [p() for p in nose.plugins.builtin.plugins]
+ if self.check_fpu_mode:
+ plugins += [FPUModeCheckPlugin()]
+ argv += ["--with-fpumodecheckplugin"]
try:
# External plugins (like nose-timer)
entrypoint_manager = EntryPointPluginManager()
@@ -548,4 +556,5 @@ def _numpy_tester():
mode = "develop"
else:
mode = "release"
- return NoseTester(raise_warnings=mode, depth=1)
+ return NoseTester(raise_warnings=mode, depth=1,
+ check_fpu_mode=True)