Fixed config tests for new compiler config format
This commit is contained in:
parent
7705603f73
commit
0fd9cdb861
@ -138,11 +138,17 @@ def check_config(self, comps, *compiler_names):
|
|||||||
"""Check that named compilers in comps match Spack's config."""
|
"""Check that named compilers in comps match Spack's config."""
|
||||||
config = spack.config.get_config('compilers')
|
config = spack.config.get_config('compilers')
|
||||||
compiler_list = ['cc', 'cxx', 'f77', 'fc']
|
compiler_list = ['cc', 'cxx', 'f77', 'fc']
|
||||||
for key in compiler_names:
|
param_list = ['modules', 'paths', 'spec', 'operating_system']
|
||||||
for c in compiler_list:
|
for alias, compiler in config.items():
|
||||||
expected = comps['all'][key][c]
|
if compiler['spec'] in compiler_names:
|
||||||
actual = config['all'][key][c]
|
for p in param_list:
|
||||||
self.assertEqual(expected, actual)
|
expected = comps[alias][p]
|
||||||
|
actual = config[alias][p]
|
||||||
|
self.assertEqual(expected, actual)
|
||||||
|
for c in compiler_list:
|
||||||
|
expected = comps[alias]['paths'][c]
|
||||||
|
actual = config[alias]['paths'][c]
|
||||||
|
self.assertEqual(expected, actual)
|
||||||
|
|
||||||
def test_write_key_in_memory(self):
|
def test_write_key_in_memory(self):
|
||||||
# Write b_comps "on top of" a_comps.
|
# Write b_comps "on top of" a_comps.
|
||||||
|
Loading…
Reference in New Issue
Block a user