diff options
| author | Andrew Lawson <andrew.lawson@nag.co.uk> | 2017-10-23 10:20:13 +0100 |
|---|---|---|
| committer | Andrew Lawson <andrew.lawson@nag.co.uk> | 2017-10-23 10:20:13 +0100 |
| commit | cb842089854d2ea7de96250c62a2f22709516bdb (patch) | |
| tree | 9ce06019fe5e342ee61e3715ded53a502a1c9982 /numpy/distutils | |
| parent | b3ac6f3ada56ca8d600d776f98098e89a0366162 (diff) | |
| download | numpy-cb842089854d2ea7de96250c62a2f22709516bdb.tar.gz | |
MAINT: made sure both compiler strings are included in test
Diffstat (limited to 'numpy/distutils')
| -rw-r--r-- | numpy/distutils/tests/test_fcompiler_nagfor.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/numpy/distutils/tests/test_fcompiler_nagfor.py b/numpy/distutils/tests/test_fcompiler_nagfor.py index 76680a445..d45d3e3ce 100644 --- a/numpy/distutils/tests/test_fcompiler_nagfor.py +++ b/numpy/distutils/tests/test_fcompiler_nagfor.py @@ -4,23 +4,22 @@ from numpy.testing import assert_, run_module_suite import numpy.distutils.fcompiler -nagfor_version_strings = [('nagfor', 'NAG Fortran Compiler Release ' - '6.2(Chiyoda) Build 6200', '6.2'), - ('nagfor', 'NAG Fortran Compiler Release ' - '6.1(Tozai) Build 6136', '6.1'), - ('nagfor', 'NAG Fortran Compiler Release ' - '6.0(Hibiya) Build 1021', '6.0'), - ('nagfor', 'NAG Fortran Compiler Release ' - '5.3.2(971)', '5.3.2')] - -nag_version_strings = [('nag', 'NAGWare Fortran 95 compiler Release 5.1' +nag_version_strings = [('nagfor', 'NAG Fortran Compiler Release ' + '6.2(Chiyoda) Build 6200', '6.2'), + ('nagfor', 'NAG Fortran Compiler Release ' + '6.1(Tozai) Build 6136', '6.1'), + ('nagfor', 'NAG Fortran Compiler Release ' + '6.0(Hibiya) Build 1021', '6.0'), + ('nagfor', 'NAG Fortran Compiler Release ' + '5.3.2(971)', '5.3.2'), + ('nag', 'NAGWare Fortran 95 compiler Release 5.1' '(347,355-367,375,380-383,389,394,399,401-402,407,' '431,435,437,446,459-460,463,472,494,496,503,508,' '511,517,529,555,557,565)', '5.1')] class TestNagFCompilerVersions(object): def test_version_match(self): - for comp, vs, version in nagfor_version_strings: + for comp, vs, version in nag_version_strings: fc = numpy.distutils.fcompiler.new_fcompiler(compiler=comp) v = fc.version_match(vs) assert_(v == version) |