Merge pull request #3543 from boegel/easystack_SYSTEM_toolchain

detect 'SYSTEM' toolchain as special case in easystack files

Author: bartoldeman

easybuild/framework/easystack.py

@@ -110,14 +110,18 @@ def parse(filepath):
                 raise EasyBuildError("Toolchains for software '%s' are not defined in %s", name, filepath)
             for toolchain in toolchains:
                 toolchain = str(toolchain)
-                toolchain_parts = toolchain.split('-', 1)
-                if len(toolchain_parts) == 2:
-                    toolchain_name, toolchain_version = toolchain_parts
-                elif len(toolchain_parts) == 1:
-                    toolchain_name, toolchain_version = toolchain, ''
+
+                if toolchain == 'SYSTEM':
+                    toolchain_name, toolchain_version = 'system', ''
                 else:
-                    raise EasyBuildError("Incorrect toolchain specification for '%s' in %s, too many parts: %s",
-                                         name, filepath, toolchain_parts)
+                    toolchain_parts = toolchain.split('-', 1)
+                    if len(toolchain_parts) == 2:
+                        toolchain_name, toolchain_version = toolchain_parts
+                    elif len(toolchain_parts) == 1:
+                        toolchain_name, toolchain_version = toolchain, ''
+                    else:
+                        raise EasyBuildError("Incorrect toolchain specification for '%s' in %s, too many parts: %s",
+                                             name, filepath, toolchain_parts)
 
                 try:
                     # if version string containts asterisk or labels, raise error (asterisks not supported)

test/framework/easystacks/test_easystack_basic.yaml

@@ -5,9 +5,13 @@ software:
         versions:
           2.25:
           2.26:
+  foss:
+    toolchains:
+      SYSTEM:
+        versions: [2018a]
   toy:
     toolchains:
       gompi-2018a:
         versions:
           0.0:
-            versionsuffix: '-test'
+            versionsuffix: '-test'

test/framework/options.py

@@ -5725,10 +5725,12 @@ def test_easystack_basic(self):
         patterns = [
             r"[\S\s]*INFO Building from easystack:[\S\s]*",
             r"[\S\s]*DEBUG EasyStack parsed\. Proceeding to install these Easyconfigs: "
-            r"binutils-2.25-GCCcore-4.9.3.eb, binutils-2.26-GCCcore-4.9.3.eb, toy-0.0-gompi-2018a-test.eb",
+            r"binutils-2.25-GCCcore-4.9.3.eb, binutils-2.26-GCCcore-4.9.3.eb, "
+            r"foss-2018a.eb, toy-0.0-gompi-2018a-test.eb",
             r"\* \[ \] .*/test_ecs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb \(module: binutils/2.25-GCCcore-4.9.3\)",
             r"\* \[ \] .*/test_ecs/b/binutils/binutils-2.26-GCCcore-4.9.3.eb \(module: binutils/2.26-GCCcore-4.9.3\)",
             r"\* \[ \] .*/test_ecs/t/toy/toy-0.0-gompi-2018a-test.eb \(module: toy/0.0-gompi-2018a-test\)",
+            r"\* \[x\] .*/test_ecs/f/foss/foss-2018a.eb \(module: foss/2018a\)",
         ]
         for pattern in patterns:
             regex = re.compile(pattern)