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

Fixed test config to work on yosemite

Browse Source
This commit is contained in:
Gregory Becker 2016-05-25 16:06:14 -07:00
parent 0f40174723
commit 8f99334f11
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/architecture.py
View File

@ -385,7 +385,7 @@ def concrete(self):
def __str__(self): def __str__(self):
if self.platform or self.platform_os or self.target: if self.platform or self.platform_os or self.target:
if self.platform.name == 'darwin': if self.platform.name == 'darwin':
os_name = self.platform_os.name os_name = self.platform_os.name if self.platform_os else "None"
else: else:
os_name = str(self.platform_os) os_name = str(self.platform_os)

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

@ -69,6 +69,17 @@
f77: None f77: None
fc: None fc: None
modules: 'None' modules: 'None'
clang3.3OSX:
spec: clang@3.3
operating_system:
name: yosemite
version: '10.10'
paths:
cc: /path/to/clang
cxx: /path/to/clang++
f77: None
fc: None
modules: 'None'
gcc4.5.0CNL: gcc4.5.0CNL:
paths: paths:
cc: /path/to/gcc cc: /path/to/gcc
@ -98,10 +109,21 @@
f77: /path/to/gfortran f77: /path/to/gfortran
fc: /path/to/gfortran fc: /path/to/gfortran
operating_system: operating_system:
name: RHL name: redhat
version: '6.7' version: '6.7'
spec: gcc@4.5.0 spec: gcc@4.5.0
modules: 'None' modules: 'None'
gcc4.5.0OSX:
paths:
cc: /path/to/gcc
cxx: /path/to/g++
f77: /path/to/gfortran
fc: /path/to/gfortran
operating_system:
name: yosemite
version: '10.10'
spec: gcc@4.5.0
modules: 'None'
""" """
mock_packages_config = """\ mock_packages_config = """\