zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to-string for CNL operating system (#2526)

Browse Source
This commit is contained in:
scheibelp
2016-12-08 11:41:34 -08:00
committed by Todd Gamblin
parent be300eb6d5
commit 065e3d7c0d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/operating_systems/cnl.py
View File

@@ -22,7 +22,7 @@ def __init__(self):
super(Cnl, self).__init__(name, version) super(Cnl, self).__init__(name, version)
def __str__(self): def __str__(self):
return self.name + self.version return self.name
def find_compilers(self, *paths): def find_compilers(self, *paths):
types = spack.compilers.all_compiler_types() types = spack.compilers.all_compiler_types()

4
lib/spack/spack/test/mock_packages_test.py
View File

@@ -66,7 +66,7 @@
modules: 'None' modules: 'None'
- compiler: - compiler:
spec: clang@3.3 spec: clang@3.3
operating_system: CNL10 operating_system: CNL
paths: paths:
cc: /path/to/clang cc: /path/to/clang
cxx: /path/to/clang++ cxx: /path/to/clang++
@@ -97,7 +97,7 @@
cxx: /path/to/g++ cxx: /path/to/g++
f77: /path/to/gfortran f77: /path/to/gfortran
fc: /path/to/gfortran fc: /path/to/gfortran
operating_system: CNL10 operating_system: CNL
spec: gcc@4.5.0 spec: gcc@4.5.0
modules: 'None' modules: 'None'
- compiler: - compiler: