Merge pull request #1163 from ekouts/bugfix/setup_hooks

[bugfix] Execute setup hooks for `CompileOnlyRegressionTest` and make the run hooks for the `RunOnlyRegressionTest` execute at the right place

Author: Vasileios Karakasis

reframe/core/pipeline.py

@@ -1506,6 +1506,7 @@ def compile_wait(self):
         This is a no-op for this type of test.
         '''
 
+    @_run_hooks('pre_run')
     def run(self):
         '''The run phase of the regression test pipeline.
 
@@ -1519,7 +1520,7 @@ def run(self):
                 self._copy_to_stagedir(os.path.join(self._prefix,
                                                     self.sourcesdir))
 
-        super().run()
+        super().run.__wrapped__(self)
 
 
 class CompileOnlyRegressionTest(RegressionTest):
@@ -1539,6 +1540,7 @@ def _rfm_init(self, *args, **kwargs):
         super()._rfm_init(*args, **kwargs)
         self.local = True
 
+    @_run_hooks()
     def setup(self, partition, environ, **job_opts):
         '''The setup stage of the regression test pipeline.
 

unittests/test_pipeline.py

@@ -457,6 +457,30 @@ def postfoo(self):
         assert '_RFM_PRE_SETUP' in os.environ
         assert '_RFM_POST_SETUP' in os.environ
 
+    def test_setup_hooks_in_compile_only_test(self):
+        @fixtures.custom_prefix('unittests/resources/checks')
+        class MyTest(rfm.CompileOnlyRegressionTest):
+            def __init__(self):
+                self.name = 'hellocheck_compile'
+                self.valid_systems = ['*']
+                self.valid_prog_environs = ['*']
+                self.sourcepath = 'hello.c'
+                self.executable = os.path.join('.', self.name)
+                self.sanity_patterns = sn.assert_found('.*', self.stdout)
+                self.count = 0
+
+            @rfm.run_before('setup')
+            def presetup(self):
+                self.count += 1
+
+            @rfm.run_after('setup')
+            def postsetup(self):
+                self.count += 1
+
+        test = MyTest()
+        _run(test, self.partition, self.prgenv)
+        assert test.count == 2
+
     def test_compile_hooks(self):
         @fixtures.custom_prefix('unittests/resources/checks')
         class MyTest(HelloTest):
@@ -498,6 +522,26 @@ def check_executable(self):
         test = MyTest()
         _run(test, self.partition, self.prgenv)
 
+    def test_run_hooks_in_run_only_test(self):
+        @fixtures.custom_prefix('unittests/resources/checks')
+        class MyTest(rfm.RunOnlyRegressionTest):
+            def __init__(self):
+                self.executable = 'echo'
+                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_before('run')
+            def check_empty_stage(self):
+                # Make sure nothing has been copied to the stage directory yet
+                assert len(os.listdir(self.stagedir)) == 0
+
+        test = MyTest()
+        _run(test, self.partition, self.prgenv)
+
     def test_multiple_hooks(self):
         @fixtures.custom_prefix('unittests/resources/checks')
         class MyTest(HelloTest):