diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-01 21:52:17 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-01 21:52:17 -0400 |
| commit | ab1ea1f094367070b475c5bfc5c0dfc9284eb1d1 (patch) | |
| tree | 6b45dbb439ab94fc1b3ca400bcfa948bb38adcbd | |
| parent | c33d59db5d8ba1449a7abde6883179619acef0ab (diff) | |
| parent | dd220014373f7c0bf0862b5a4548e257858be945 (diff) | |
| download | numpy-ab1ea1f094367070b475c5bfc5c0dfc9284eb1d1.tar.gz | |
Merge pull request #6139 from cgohlke/patch-3
TST: on Windows run f2py from the Scripts directory
| -rw-r--r-- | numpy/tests/test_scripts.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/tests/test_scripts.py b/numpy/tests/test_scripts.py index b48e3f3f7..c7bb125b3 100644 --- a/numpy/tests/test_scripts.py +++ b/numpy/tests/test_scripts.py @@ -60,6 +60,10 @@ def run_command(cmd, check_code=True): @skipif_inplace def test_f2py(): # test that we can run f2py script - f2py_cmd = 'f2py' + basename(sys.executable)[6:] - code, stdout, stderr = run_command([f2py_cmd, '-v']) + if sys.platform == 'win32': + f2py_cmd = r"%s\Scripts\f2py.py" % dirname(sys.executable) + code, stdout, stderr = run_command([sys.executable, f2py_cmd, '-v']) + else: + f2py_cmd = 'f2py' + basename(sys.executable)[6:] + code, stdout, stderr = run_command([f2py_cmd, '-v']) assert_equal(stdout.strip(), asbytes('2')) |