Merge pull request #2928 from vkarak/bugfix/job-test-name

[bugfix] Use tests's short name as the name of the job

Author: vkarak

reframe/core/pipeline.py

@@ -1645,7 +1645,7 @@ def _setup_paths(self):
         except OSError as e:
             raise PipelineError('failed to set up paths') from e
 
-    def _create_job(self, name, force_local=False, **job_opts):
+    def _create_job(self, job_type, force_local=False, **job_opts):
         '''Setup the job related to this check.'''
 
         if force_local:
@@ -1656,24 +1656,31 @@ def _create_job(self, name, force_local=False, **job_opts):
             launcher = self._current_partition.launcher_type()
 
         self.logger.debug(
-            f'Setting up job {name!r} '
+            f'Setting up {type} job for test {self.name!r} '
             f'(scheduler: {scheduler.registered_name!r}, '
             f'launcher: {launcher.registered_name!r})'
         )
+
+        if job_type == 'build':
+            script_name = 'rfm_build.sh'
+        elif job_type == 'run':
+            script_name = 'rfm_job.sh'
+
         return Job.create(scheduler,
                           launcher,
-                          name=name,
+                          name=f'rfm_{self.short_name}',
+                          script_filename=script_name,
                           workdir=self._stagedir,
                           sched_access=self._current_partition.access,
                           **job_opts)
 
     def _setup_build_job(self, **job_opts):
-        self._build_job = self._create_job(f'rfm_build',
-                                           self.local or self.build_locally,
-                                           **job_opts)
+        self._build_job = self._create_job(
+            'build', self.local or self.build_locally, **job_opts
+        )
 
     def _setup_run_job(self, **job_opts):
-        self._job = self._create_job(f'rfm_job', self.local, **job_opts)
+        self._job = self._create_job(f'run', self.local, **job_opts)
 
     def _setup_container_platform(self):
         try:

reframe/core/schedulers/__init__.py

@@ -8,6 +8,7 @@
 #
 
 import abc
+import os
 import time
 
 import reframe.core.runtime as runtime
@@ -330,9 +331,11 @@ def __init__(self,
         self._cli_options = list(sched_options) if sched_options else []
         self._name = name
         self._workdir = workdir
-        self._script_filename = script_filename or '%s.sh' % name
-        self._stdout = stdout or '%s.out' % name
-        self._stderr = stderr or '%s.err' % name
+        self._script_filename = script_filename or f'{name}.sh'
+
+        basename, _ = os.path.splitext(self._script_filename)
+        self._stdout = stdout or f'{basename}.out'
+        self._stderr = stderr or f'{basename}.err'
 
         # Backend scheduler related information
         self._sched_flex_alloc_nodes = sched_flex_alloc_nodes