added environment variable TEST_CPPCHECK_INJECT_BUILDDIR to inject --cppcheck-build-dir into the cppcheck invocation of Python tests [skip ci]

Author: firewave

.github/workflows/CI-unixish.yml

@@ -424,6 +424,14 @@ jobs:
         env:
           TEST_CPPCHECK_INJECT_CLANG: clang
 
+      # do not use pushd in this step since we go below the working directory
+      - name: Run test/cli (--cppcheck-build-dir)
+        run: |
+          cd test/cli
+          python3 -m pytest -Werror --strict-markers -vv
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
       - name: Run cfg tests
         if: matrix.os != 'ubuntu-22.04'
         run: |

.github/workflows/CI-windows.yml

@@ -191,6 +191,14 @@ jobs:
         env:
           TEST_CPPCHECK_INJECT_CLANG: clang
 
+      - name: Run test/cli (--cppcheck-build-dir)
+        if: matrix.config == 'release'
+        run: |
+          cd test/cli || exit /b !errorlevel!
+          python -m pytest -Werror --strict-markers -vv || exit /b !errorlevel!
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
       - name: Test addons
         if: matrix.config == 'release'
         run: |

.github/workflows/asan.yml

@@ -120,6 +120,14 @@ jobs:
         env:
           TEST_CPPCHECK_INJECT_CLANG: clang
 
+      - name: Run test/cli (--cppcheck-build-dir)
+        run: |
+          pwd=$(pwd)
+          cd test/cli
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
       - name: Generate dependencies
         if: false
         run: |

.github/workflows/tsan.yml

@@ -121,6 +121,14 @@ jobs:
         env:
           TEST_CPPCHECK_INJECT_CLANG: clang
 
+      - name: Run test/cli (--cppcheck-build-dir)
+        run: |
+          pwd=$(pwd)
+          cd test/cli
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
       - name: Generate dependencies
         if: false
         run: |

.github/workflows/ubsan.yml

@@ -119,6 +119,14 @@ jobs:
         env:
           TEST_CPPCHECK_INJECT_CLANG: clang
 
+      - name: Run test/cli (--cppcheck-build-dir)
+        run: |
+          pwd=$(pwd)
+          cd test/cli
+          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
       - name: Generate dependencies
         run: |
           # make sure auto-generated GUI files exist

test/cli/testutils.py

@@ -4,6 +4,7 @@
 import select
 import subprocess
 import time
+import tempfile
 
 # Create Cppcheck project file
 import sys
@@ -188,6 +189,19 @@ def cppcheck_ex(args, env=None, remove_checkers_report=True, cwd=None, cppcheck_
             arg_executor = '--executor=' + str(os.environ['TEST_CPPCHECK_INJECT_EXECUTOR'])
             args.append(arg_executor)
 
+    builddir_tmp = None
+
+    if 'TEST_CPPCHECK_INJECT_BUILDDIR' in os.environ:
+        found_builddir = False
+        for arg in args:
+            if arg.startswith('--cppcheck-build-dir='):
+                found_builddir = True
+                break
+        if not found_builddir:
+            builddir_tmp = tempfile.TemporaryDirectory(prefix=str(os.environ['TEST_CPPCHECK_INJECT_BUILDDIR']))
+            arg_clang = '--cppcheck-build-dir=' + builddir_tmp.name
+            args.append(arg_clang)
+
     logging.info(exe + ' ' + ' '.join(args))
 
     run_subprocess = __run_subprocess_tty if tty else __run_subprocess
@@ -196,6 +210,9 @@ def cppcheck_ex(args, env=None, remove_checkers_report=True, cwd=None, cppcheck_
     stdout = stdout.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
     stderr = stderr.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
 
+    if builddir_tmp:
+        builddir_tmp.cleanup()
+
     if remove_checkers_report:
         if stderr.find('[checkersReport]\n') > 0:
             start_id = stderr.find('[checkersReport]\n')