Changed names again.

source/fab/tools/compiler.py

@@ -524,7 +524,7 @@ class Craycc(CCompiler):
     :param name: name of this compiler.
     :param exec_name: name of the executable.
     '''
-    def __init__(self, name: str = "craycc-cray", exec_name: str = "cc"):
+    def __init__(self, name: str = "craycc-cc", exec_name: str = "cc"):
         super().__init__(name, exec_name, suite="cray", mpi=True,
                          openmp_flag="-homp",
                          version_regex=r"Cray [Cc][^\d]* (\d[\d\.]+\d)  ")
@@ -540,7 +540,7 @@ class Crayftn(FortranCompiler):
     :param exec_name: name of the executable.
     '''
 
-    def __init__(self, name: str = "crayftn-cray", exec_name: str = "ftn"):
+    def __init__(self, name: str = "crayftn-ftn", exec_name: str = "ftn"):
         super().__init__(name, exec_name, suite="cray", mpi=True,
                          module_folder_flag="-J",
                          openmp_flag="-homp",

tests/unit_tests/tools/test_compiler.py

@@ -816,7 +816,7 @@ def test_nvfortran_get_version_with_ifort_string():
 def test_craycc():
     '''Tests the Craycc class.'''
     craycc = Craycc()
-    assert craycc.name == "craycc-cray"
+    assert craycc.name == "craycc-cc"
     assert isinstance(craycc, CCompiler)
     assert craycc.category == Category.C_COMPILER
     assert craycc.mpi
@@ -882,7 +882,7 @@ def test_craycc_get_version_with_icc_string():
 def test_crayftn():
     '''Tests the Crayftn class.'''
     crayftn = Crayftn()
-    assert crayftn.name == "crayftn-cray"
+    assert crayftn.name == "crayftn-ftn"
     assert isinstance(crayftn, FortranCompiler)
     assert crayftn.category == Category.FORTRAN_COMPILER
     assert crayftn.mpi