summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGregory Becker <becker33@llnl.gov>2016-05-16 09:56:07 -0700
committerGregory Becker <becker33@llnl.gov>2016-05-16 09:56:07 -0700
commit0fd9cdb861b9b794cc6aa20cd5ecca1989a43820 (patch)
treed7304259075e5a47a1de8d105c2642dfbcc1add1 /lib
parent7705603f7302f7e7c1076d3aff53cb1829fb8e74 (diff)
downloadspack-0fd9cdb861b9b794cc6aa20cd5ecca1989a43820.tar.gz
spack-0fd9cdb861b9b794cc6aa20cd5ecca1989a43820.tar.bz2
spack-0fd9cdb861b9b794cc6aa20cd5ecca1989a43820.tar.xz
spack-0fd9cdb861b9b794cc6aa20cd5ecca1989a43820.zip
Fixed config tests for new compiler config format
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/test/config.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py
index 2a8d642584..daa4c572bd 100644
--- a/lib/spack/spack/test/config.py
+++ b/lib/spack/spack/test/config.py
@@ -138,11 +138,17 @@ class ConfigTest(MockPackagesTest):
"""Check that named compilers in comps match Spack's config."""
config = spack.config.get_config('compilers')
compiler_list = ['cc', 'cxx', 'f77', 'fc']
- for key in compiler_names:
- for c in compiler_list:
- expected = comps['all'][key][c]
- actual = config['all'][key][c]
- self.assertEqual(expected, actual)
+ param_list = ['modules', 'paths', 'spec', 'operating_system']
+ for alias, compiler in config.items():
+ if compiler['spec'] in compiler_names:
+ for p in param_list:
+ 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):
# Write b_comps "on top of" a_comps.