diff options
| author | Tomoki, Karatsu <49965247+t-karatsu@users.noreply.github.com> | 2020-08-07 23:06:22 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 09:06:22 -0500 |
| commit | c83236d3a49cff03c54f116b788770233698beba (patch) | |
| tree | 36e9229d3574482f789c1d7ba933bdc93df4ed71 /lib | |
| parent | c1efa09928b540f9350d9b29503f1c5e1a38aa23 (diff) | |
| download | spack-c83236d3a49cff03c54f116b788770233698beba.tar.gz spack-c83236d3a49cff03c54f116b788770233698beba.tar.bz2 spack-c83236d3a49cff03c54f116b788770233698beba.tar.xz spack-c83236d3a49cff03c54f116b788770233698beba.zip | |
Fujitsu compiler: Accept alphabet as version. (#17890)
* Fujitsu compiler: Accept alphabet as version.
* Fujitsu copiler: Updated test pattern.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compilers/fj.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/compilers/detection.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/spack/spack/compilers/fj.py b/lib/spack/spack/compilers/fj.py index 3747d49d9b..c2cc66e110 100644 --- a/lib/spack/spack/compilers/fj.py +++ b/lib/spack/spack/compilers/fj.py @@ -26,7 +26,7 @@ class Fj(spack.compiler.Compiler): 'fc': 'fj/frt'} version_argument = '--version' - version_regex = r'\((?:FCC|FRT)\) ([\d.]+)' + version_regex = r'\((?:FCC|FRT)\) ([a-z\d.]+)' required_libs = ['libfj90i', 'libfj90f', 'libfjsrcinfo'] diff --git a/lib/spack/spack/test/compilers/detection.py b/lib/spack/spack/test/compilers/detection.py index f36e15804d..634189d02a 100644 --- a/lib/spack/spack/test/compilers/detection.py +++ b/lib/spack/spack/test/compilers/detection.py @@ -104,19 +104,19 @@ def test_clang_version_detection(version_str, expected_version): @pytest.mark.parametrize('version_str,expected_version', [ # C compiler - ('fcc (FCC) 4.0.0 20190314\n' + ('fcc (FCC) 4.0.0a 20190314\n' 'simulating gcc version 6.1\n' 'Copyright FUJITSU LIMITED 2019', - '4.0.0'), + '4.0.0a'), # C++ compiler - ('FCC (FCC) 4.0.0 20190314\n' + ('FCC (FCC) 4.0.0a 20190314\n' 'simulating gcc version 6.1\n' 'Copyright FUJITSU LIMITED 2019', - '4.0.0'), + '4.0.0a'), # Fortran compiler - ('frt (FRT) 4.0.0 20190314\n' + ('frt (FRT) 4.0.0a 20190314\n' 'Copyright FUJITSU LIMITED 2019', - '4.0.0') + '4.0.0a') ]) def test_fj_version_detection(version_str, expected_version): version = spack.compilers.fj.Fj.extract_version_from_output(version_str) |