adjusted some Python tests

danmar · Feb 5, 2025 · 8a60c2c · 8a60c2c
1 parent 5863636
commit 8a60c2c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/test/cli/other_test.py b/test/cli/other_test.py
@@ -2766,12 +2766,15 @@ def __test_addon_suppr(tmp_path, extra_args):
 def test_addon_suppr_inline(tmp_path):
     __test_addon_suppr(tmp_path, ['--inline-suppr', '-j1'])
 
+# TODO: remove override when all issues are fixed
+def test_addon_suppr_inline_j_thread(tmp_path):
+    __test_addon_suppr(tmp_path, ['--inline-suppr', '-j2', '--executor=thread'])
 
 # TODO: remove override when all issues are fixed
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
 @pytest.mark.xfail(strict=True)  # TODO: inline suppression does not work
-def test_addon_suppr_inline_j(tmp_path):
-    __test_addon_suppr(tmp_path, ['--inline-suppr', '-j2'])
-
+def test_addon_suppr_inline_j_process(tmp_path):
+    __test_addon_suppr(tmp_path, ['--inline-suppr', '-j2', '--executor=process'])
 
 def test_addon_suppr_cli_line(tmp_path):
     __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:*:3'])

diff --git a/test/cli/unused_function_test.py b/test/cli/unused_function_test.py
@@ -4,6 +4,7 @@
 import os
 import json
 import pytest
+import sys
 from testutils import cppcheck
 
 __script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -61,11 +62,19 @@ def test_unused_functions_builddir(tmpdir):
     __test_unused_functions(['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
 
 
+def test_unused_functions_builddir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
 @pytest.mark.xfail(strict=True)
-def test_unused_functions_builddir_j(tmpdir):
+def test_unused_functions_builddir_j_process(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
-    __test_unused_functions(['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+    __test_unused_functions(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
+
 
 def __test_unused_functions_project(extra_args):
     project_file = os.path.join(__project_dir, 'unusedFunction.cppcheck')
@@ -111,11 +120,18 @@ def test_unused_functions_project_builddir(tmpdir):
     __test_unused_functions_project(['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
 
 
+def test_unused_functions_project_builddir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_project(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
 @pytest.mark.xfail(strict=True)
-def test_unused_functions_project_builddir_j(tmpdir):
+def test_unused_functions_project_builddir_j_process(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
-    __test_unused_functions_project(['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+    __test_unused_functions_project(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
 
 
 def __test_unused_functions_compdb(tmpdir, extra_args):
@@ -163,8 +179,15 @@ def test_unused_functions_compdb_builddir(tmpdir):
     __test_unused_functions_compdb(tmpdir, ['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
 
 
+def test_unused_functions_compdb_buildir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_compdb(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
 @pytest.mark.xfail(strict=True)
-def test_unused_functions_compdb_buildir_j(tmpdir):
+def test_unused_functions_compdb_buildir_j_process(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
-    __test_unused_functions_compdb(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+    __test_unused_functions_compdb(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])