Merge branch 'feat/module-collections' of github.com:vkarak/reframe into feat/module-collections

Author: Vasileios Karakasis

JenkinsfileDeploy

@@ -2,7 +2,7 @@ def tag = env.TAG_NAME
 def version = tag.substring(1)      // Remove the first character of the tag which is 'v'
 def machines = '[dom daint tsa]'    // To be included in the PR title
 def reviewersPR = 'teojgo,vkarak'   // The Github usernames requested for review
-def ebTemplate = '3.1-dev0'         // The eb recipe of ReFrame to use as template
+def ebTemplate = '3.3-dev0'         // The eb recipe of ReFrame to use as template
 
 stage('Deploy Tests') {
     node('daint') {

reframe/core/pipeline.py

@@ -1095,7 +1095,8 @@ def _copy_to_stagedir(self, path):
         self.logger.debug(f'Symlinking files: {self.readonly_files}')
         try:
             osext.copytree_virtual(
-                path, self._stagedir, self.readonly_files, dirs_exist_ok=True
+                path, self._stagedir, self.readonly_files, symlinks=True,
+                dirs_exist_ok=True
             )
         except (OSError, ValueError, TypeError) as e:
             raise PipelineError('copying of files failed') from e

reframe/frontend/cli.py

@@ -33,13 +33,25 @@
 from reframe.frontend.printer import PrettyPrinter
 
 
-def format_check(check, detailed=False):
+def format_check(check, check_deps, detailed=False):
     def fmt_list(x):
         if not x:
             return '<none>'
 
         return ', '.join(x)
 
+    def fmt_deps():
+        no_deps = True
+        lines = []
+        for t, deps in check_deps:
+            for d in deps:
+                lines.append(f'- {t} -> {d}')
+
+        if lines:
+            return '\n      '.join(lines)
+        else:
+            return '<none>'
+
     location = inspect.getfile(type(check))
     if not detailed:
         return f'- {check.name} (found in {location!r})'
@@ -52,7 +64,6 @@ def fmt_list(x):
         node_alloc_scheme = f'flexible (minimum {-check.num_tasks} task(s))'
 
     check_info = {
-        'Dependencies': fmt_list([d[0] for d in check.user_deps()]),
         'Description': check.descr,
         'Environment modules': fmt_list(check.modules),
         'Location': location,
@@ -64,14 +75,18 @@ def fmt_list(x):
         },
         'Tags': fmt_list(check.tags),
         'Valid environments': fmt_list(check.valid_prog_environs),
-        'Valid systems': fmt_list(check.valid_systems)
+        'Valid systems': fmt_list(check.valid_systems),
+        'Dependencies (conceptual)': fmt_list(
+            [d[0] for d in check.user_deps()]
+        ),
+        'Dependencies (actual)': fmt_deps()
     }
     lines = [f'- {check.name}:']
     for prop, val in check_info.items():
         lines.append(f'    {prop}:')
         if isinstance(val, dict):
             for k, v in val.items():
-                lines.append(f'      {k}: {v}')
+                lines.append(f'      - {k}: {v}')
         else:
             lines.append(f'      {val}')
 
@@ -88,9 +103,19 @@ def format_env(envvars):
     return ret
 
 
-def list_checks(checks, printer, detailed=False):
+def list_checks(testcases, printer, detailed=False):
     printer.info('[List of matched checks]')
-    printer.info('\n'.join(format_check(c, detailed) for c in checks))
+
+    # Collect dependencies per test
+    deps = {}
+    for t in testcases:
+        deps.setdefault(t.check.name, [])
+        deps[t.check.name].append((t, t.deps))
+
+    checks = set(t.check for t in testcases)
+    printer.info(
+        '\n'.join(format_check(c, deps[c.name], detailed) for c in checks)
+    )
     printer.info(f'Found {len(checks)} check(s)')
 
 
@@ -715,7 +740,7 @@ def print_infoline(param, value):
         # Act on checks
         success = True
         if options.list or options.list_detailed:
-            list_checks(checks_matched, printer, options.list_detailed)
+            list_checks(testcases, printer, options.list_detailed)
         elif options.run:
             # Setup the execution policy
             if options.exec_policy == 'serial':

unittests/resources/checks/src/hello.sh.link

@@ -0,0 +1 @@
+hello.sh

unittests/test_pipeline.py

@@ -217,6 +217,26 @@ def __init__(self):
     _run(test, *local_exec_ctx)
 
 
+def test_run_only_preserve_symlinks(local_exec_ctx):
+    @fixtures.custom_prefix('unittests/resources/checks')
+    class MyTest(rfm.RunOnlyRegressionTest):
+        def __init__(self):
+            self.executable = './hello.sh.link'
+            self.executable_opts = ['Hello, World!']
+            self.local = True
+            self.valid_prog_environs = ['*']
+            self.valid_systems = ['*']
+            self.sanity_patterns = sn.assert_found(
+                r'Hello, World\!', self.stdout
+            )
+
+        @rfm.run_after('run')
+        def check_symlinks(self):
+            assert os.path.islink(os.path.join(self.stagedir, 'hello.sh.link'))
+
+    _run(MyTest(), *local_exec_ctx)
+
+
 def test_compile_only_failure(local_exec_ctx):
     @fixtures.custom_prefix('unittests/resources/checks')
     class MyTest(rfm.CompileOnlyRegressionTest):