test/cli/testutils.py: added environment variable TEST_CPPCHECK_INJECT_EXECUTOR to inject --executor into cppcheck execution

Author: firewave

test/cli/testutils.py

@@ -87,6 +87,21 @@ def cppcheck(args, env=None, remove_checkers_report=True, cwd=None, cppcheck_exe
             arg_j = '-j' + str(os.environ['TEST_CPPCHECK_INJECT_J'])
             args.append(arg_j)
 
+    if 'TEST_CPPCHECK_INJECT_EXECUTOR' in os.environ:
+        found_jn = False
+        found_executor = False
+        for arg in args:
+            if arg.startswith('-j') and arg != '-j1':
+                found_jn = True
+                continue
+            if arg.startswith('--executor'):
+                found_executor = True
+                continue
+        # only add '--executor' if we are actually using multiple jobs
+        if found_jn and not found_executor:
+            arg_executor = '--executor=' + str(os.environ['TEST_CPPCHECK_INJECT_EXECUTOR'])
+            args.append(arg_executor)
+
     logging.info(exe + ' ' + ' '.join(args))
     p = subprocess.Popen([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd)
     try: