Merge branch 'master' into develop

Author: vkarak

docs/config_reference.rst

@@ -1065,7 +1065,7 @@ All logging handlers share the following set of common attributes:
       ``%(check_perf_lower_thres)s``, The lower threshold of the logged performance variable.
       ``%(check_perf_ref)s``, The reference value of the logged performance variable.
       ``%(check_perf_unit)s``, The measurement unit of the logged performance variable.
-      ``%(check_perf_upper)s``, The upper thresholds of the logged performance variable.
+      ``%(check_perf_upper_thres)s``, The upper threshold of the logged performance variable.
       ``%(check_perf_value)s``, The actual value of the logged performance variable.
       ``%(check_perf_var)s``, The name of the logged performance variable.
 

reframe/__init__.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-VERSION = '4.2.0-dev.2'
+VERSION = '4.2.0-dev.3'
 INSTALL_PREFIX = os.path.normpath(
     os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 )

reframe/core/logging.py

@@ -280,8 +280,8 @@ def _format_perf(self, perfvars):
                 'check_perf_value': val,
                 'check_perf_unit': unit,
                 'check_perf_ref': ref,
-                'check_perf_lower': lower,
-                'check_perf_upper': upper
+                'check_perf_lower_thres': lower,
+                'check_perf_upper_thres': upper
             }
             try:
                 chunks.append(self.__fmtperf % record)

reframe/core/settings.py

@@ -62,8 +62,8 @@
                     ),
                     'format_perfvars': (
                         '%(check_perf_value)s,%(check_perf_unit)s,'
-                        '%(check_perf_ref)s,%(check_perf_lower)s,'
-                        '%(check_perf_upper)s,'
+                        '%(check_perf_ref)s,%(check_perf_lower_thres)s,'
+                        '%(check_perf_upper_thres)s,'
                     ),
                     'append': True
                 }

reframe/frontend/ci.py

@@ -42,7 +42,7 @@ def rfm_command(testcase):
             f'--restore-session={restore_files}' if restore_files else '',
             f'--report-junit={testcase.check.unique_name}-report.xml',
             f'{"".join("-" + verbosity)}' if verbosity else '',
-            '-n', f"'^{testcase.check.unique_name}$'", '-r',
+            '-n', f'/{testcase.check.hashcode}', '-r',
             *child_pipeline_opts
         ])
 

unittests/test_policies.py

@@ -1131,8 +1131,8 @@ def test_perf_logging(make_runner, make_exec_ctx, perf_test,
             ),
             perffmt=(
                 '%(check_perf_value)s,%(check_perf_unit)s,'
-                '%(check_perf_ref)s,%(check_perf_lower)s,'
-                '%(check_perf_upper)s,'
+                '%(check_perf_ref)s,%(check_perf_lower_thres)s,'
+                '%(check_perf_upper_thres)s,'
             )
         )
     )
@@ -1309,8 +1309,8 @@ def test_perf_logging_lazy(make_runner, make_exec_ctx, lazy_perf_test,
             ),
             perffmt=(
                 '%(check_perf_value)s,%(check_perf_unit)s,'
-                '%(check_perf_ref)s,%(check_perf_lower)s,'
-                '%(check_perf_upper)s,'
+                '%(check_perf_ref)s,%(check_perf_lower_thres)s,'
+                '%(check_perf_upper_thres)s,'
             )
         )
     )