diff options
| author | scheibelp <scheibel1@llnl.gov> | 2016-12-08 11:41:34 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-12-08 11:41:34 -0800 |
| commit | 065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316 (patch) | |
| tree | d4aaeecdf14bc6bfa9c14f72d4567df3a8443ffb | |
| parent | be300eb6d55776581da9a4abafc69a4c3ca9fe74 (diff) | |
| download | spack-065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316.tar.gz spack-065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316.tar.bz2 spack-065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316.tar.xz spack-065e3d7c0d3bfe6fd141391c26c6c0df8c3bb316.zip | |
Revert to-string for CNL operating system (#2526)
| -rw-r--r-- | lib/spack/spack/operating_systems/cnl.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/mock_packages_test.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index fa5394ce66..78807865b3 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -22,7 +22,7 @@ class Cnl(OperatingSystem): super(Cnl, self).__init__(name, version) def __str__(self): - return self.name + self.version + return self.name def find_compilers(self, *paths): types = spack.compilers.all_compiler_types() diff --git a/lib/spack/spack/test/mock_packages_test.py b/lib/spack/spack/test/mock_packages_test.py index a1919cd437..eab96165e0 100644 --- a/lib/spack/spack/test/mock_packages_test.py +++ b/lib/spack/spack/test/mock_packages_test.py @@ -66,7 +66,7 @@ compilers: modules: 'None' - compiler: spec: clang@3.3 - operating_system: CNL10 + operating_system: CNL paths: cc: /path/to/clang cxx: /path/to/clang++ @@ -97,7 +97,7 @@ compilers: cxx: /path/to/g++ f77: /path/to/gfortran fc: /path/to/gfortran - operating_system: CNL10 + operating_system: CNL spec: gcc@4.5.0 modules: 'None' - compiler: |