From 83d8acd122fa70b65c593845ff1813ae4f6caf37 Mon Sep 17 00:00:00 2001 From: firewave Date: Sun, 15 Dec 2024 18:10:13 +0100 Subject: [PATCH] added missing `pytest-xdist` usage in CI these steps were added after I opened the initial PR --- .github/workflows/CI-unixish.yml | 8 +++++--- .github/workflows/CI-windows.yml | 5 +++-- .github/workflows/asan.yml | 2 +- .github/workflows/tsan.yml | 2 +- .github/workflows/ubsan.yml | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index ebb2950733a..40a6ce36947 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -369,7 +369,7 @@ jobs: - name: Run test/cli (--cppcheck-build-dir) run: | - python3 -m pytest -Werror --strict-markers -vv test/cli + python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} test/cli env: TEST_CPPCHECK_INJECT_BUILDDIR: injected @@ -448,18 +448,20 @@ jobs: ../../cppcheck --dump naming_test.cpp python3 ../naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump + # TODO: run with "-n auto" when misra_test.py can be run in parallel - name: test addons (Python) if: matrix.os != 'ubuntu-22.04' run: | - python3 -m pytest -Werror --strict-markers -vv addons/test + python3 -m pytest -Werror --strict-markers -vv -n 1 addons/test env: PYTHONPATH: ./addons + # TODO: run with "-n auto" when misra_test.py can be run in parallel # we cannot specify -Werror since xml/etree/ElementTree.py in Python 3.10 contains an unclosed file - name: test addons (Python) if: matrix.os == 'ubuntu-22.04' run: | - python3 -m pytest --strict-markers -vv addons/test + python3 -m pytest --strict-markers -vv -n 1 addons/test env: PYTHONPATH: ./addons diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index 18ccaf3bbf7..8ff3d065e4b 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -203,7 +203,7 @@ jobs: - name: Run test/cli (--cppcheck-build-dir) if: matrix.config == 'release' run: | - python -m pytest -Werror --strict-markers -vv test/cli || exit /b !errorlevel! + python -m pytest -Werror --strict-markers -vv -n auto test/cli || exit /b !errorlevel! env: TEST_CPPCHECK_INJECT_BUILDDIR: injected @@ -238,10 +238,11 @@ jobs: ..\..\cppcheck --dump naming_test.cpp || exit /b !errorlevel! python3 ..\naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump || exit /b !errorlevel! + # TODO: run with "-n auto" when misra_test.py can be run in parallel - name: test addons (Python) if: matrix.config == 'release' run: | - python -m pytest -Werror --strict-markers -vv addons/test || exit /b !errorlevel! + python -m pytest -Werror --strict-markers -vv -n 1 addons/test || exit /b !errorlevel! env: PYTHONPATH: ./addons diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index f01898ef533..819deb2e4cf 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -124,7 +124,7 @@ jobs: - name: Run test/cli (--cppcheck-build-dir) run: | pwd=$(pwd) - TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli + TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli env: TEST_CPPCHECK_INJECT_BUILDDIR: injected diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 8651983ae2d..7783fe93464 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -126,7 +126,7 @@ jobs: - name: Run test/cli (--cppcheck-build-dir) run: | pwd=$(pwd) - TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli + TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli env: TEST_CPPCHECK_INJECT_BUILDDIR: injected diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index cab77d1489a..761f94906ac 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -124,7 +124,7 @@ jobs: - name: Run test/cli (--cppcheck-build-dir) run: | pwd=$(pwd) - TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli + TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli env: TEST_CPPCHECK_INJECT_BUILDDIR: injected