diff options
-rw-r--r-- | numpy/distutils/tests/test_fcompiler_nagfor.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/numpy/distutils/tests/test_fcompiler_nagfor.py b/numpy/distutils/tests/test_fcompiler_nagfor.py index 461aee6c0..76680a445 100644 --- a/numpy/distutils/tests/test_fcompiler_nagfor.py +++ b/numpy/distutils/tests/test_fcompiler_nagfor.py @@ -4,21 +4,24 @@ from numpy.testing import assert_, run_module_suite import numpy.distutils.fcompiler -nagfor_version_strings = [('NAG Fortran Compiler Release 6.2(Chiyoda) Build 6200', '6.2')] - -nag_version_strings = [('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')] +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' + '(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): - fc = numpy.distutils.fcompiler.new_fcompiler(compiler='nagfor') - for vs, version in nagfor_version_strings: - v = fc.version_match(vs) - assert_(v == version) - - fc = numpy.distutils.fcompiler.new_fcompiler(compiler='nag') - for vs, version in nag_version_strings: + for comp, vs, version in nagfor_version_strings: + fc = numpy.distutils.fcompiler.new_fcompiler(compiler=comp) v = fc.version_match(vs) assert_(v == version) |