Fix missing command output in test_step

Author: Flamefire

easybuild/framework/easyblock.py

@@ -2139,10 +2139,11 @@ def build_step(self):
 
     def test_step(self):
         """Run unit tests provided by software (if any)."""
-        if self.cfg['runtest']:
+        unit_test_cmd = self.cfg['runtest']
+        if unit_test_cmd:
 
-            self.log.debug("Trying to execute %s as a command for running unit tests...")
-            (out, _) = run_cmd(self.cfg['runtest'], log_all=True, simple=False)
+            self.log.debug("Trying to execute %s as a command for running unit tests...", unit_test_cmd)
+            (out, _) = run_cmd(unit_test_cmd, log_all=True, simple=False)
 
             return out
 
@@ -3310,6 +3311,10 @@ def build_and_install_one(ecdict, init_env):
         _log.debug("Skip set to %s" % skip)
         app.cfg['skip'] = skip
 
+    if build_option('skip_test_step'):
+        _log.debug('Adding test_step to skipped steps')
+        app.cfg.update('skipsteps', TEST_STEP, allow_duplicate=False)
+
     # build easyconfig
     errormsg = '(no error)'
     # timing info

easybuild/tools/config.py

@@ -253,6 +253,7 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
         'sequential',
         'set_gid_bit',
         'skip_test_cases',
+        'skip_test_step',
         'generate_devel_module',
         'sticky_bit',
         'trace',

easybuild/tools/options.py

@@ -439,6 +439,7 @@ def override_options(self):
             'silence-deprecation-warnings': ("Silence specified deprecation warnings", 'strlist', 'extend', None),
             'sticky-bit': ("Set sticky bit on newly created directories", None, 'store_true', False),
             'skip-test-cases': ("Skip running test cases", None, 'store_true', False, 't'),
+            'skip-test-step': ("Skip running the test step (e.g. unit tests)", None, 'store_true', False),
             'generate-devel-module': ("Generate a develop module file, implies --force if disabled",
                                       None, 'store_true', True),
             'sysroot': ("Location root directory of system, prefix for standard paths like /usr/lib and /usr/include",

test/framework/options.py

@@ -340,6 +340,36 @@ def test_skip(self):
 
         self.assertEqual(len(glob.glob(toy_mod_glob)), 1)
 
+    def test_skip_test_step(self):
+        """Test skipping testing the build (--skip-test-step)."""
+
+        topdir = os.path.abspath(os.path.dirname(__file__))
+        toy_ec = os.path.join(topdir, 'easyconfigs', 'test_ecs', 't', 'toy', 'toy-0.0-test.eb')
+
+        # check log message without --skip-test-step
+        args = [
+            toy_ec,
+            '--extended-dry-run',
+            '--force',
+            '--debug',
+        ]
+        outtxt = self.eb_main(args, do_build=True)
+        found_msg = "Running method test_step part of step test"
+        found = re.search(found_msg, outtxt)
+        test_run_msg = "execute make_test dummy_cmd as a command for running unit tests"
+        self.assertTrue(found, "Message about test step being run is present, outtxt: %s" % outtxt)
+        found = re.search(test_run_msg, outtxt)
+        self.assertTrue(found, "Test execution command is present, outtxt: %s" % outtxt)
+
+        # And now with the argument
+        args.append('--skip-test-step')
+        outtxt = self.eb_main(args, do_build=True)
+        found_msg = "Skipping test step"
+        found = re.search(found_msg, outtxt)
+        self.assertTrue(found, "Message about test step being skipped is present, outtxt: %s" % outtxt)
+        found = re.search(test_run_msg, outtxt)
+        self.assertFalse(found, "Test execution command is NOT present, outtxt: %s" % outtxt)
+
     def test_job(self):
         """Test submitting build as a job."""