Merge branch 'danmar:main' into main

Author: winterz

.github/workflows/CI-unixish-docker.yml

@@ -127,7 +127,7 @@ jobs:
       # requires python3
       - name: Run extra tests
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       # requires which
       - name: Validate

.github/workflows/CI-unixish.yml

@@ -311,7 +311,7 @@ jobs:
       # requires "gnu-sed" installed on macos
       - name: Run extra tests
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       - name: Run test/cli
         run: |

.github/workflows/CI-windows.yml

@@ -47,7 +47,9 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           modules: 'qtcharts'
+          setup-python: 'false'
           cache: true
+          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
       - name: Run CMake for GUI release (Qt 5)
         if: startsWith(matrix.qt_ver, '5')

.github/workflows/asan.yml

@@ -60,6 +60,7 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           cache: true
 
       - name: Install missing Python packages

.github/workflows/clang-tidy.yml

@@ -51,6 +51,7 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           install-deps: false
           cache: true
 
@@ -84,3 +85,9 @@ jobs:
         if: ${{ github.event.schedule != '' || github.event_name == 'workflow_dispatch' }}
         run: |
           cmake --build cmake.output --target run-clang-tidy-csa 2> /dev/null
+
+      - uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: Compilation Database
+          path: ./cmake.output/compile_commands.json

.github/workflows/iwyu.yml

@@ -26,6 +26,7 @@ jobs:
           - os: macos-13
             image: ""
             stdlib: libc++  # no libstdc++ on macOS
+            mapping_file_opt: '-Xiwyu --mapping_file=$(realpath ./macos.imp)'
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -73,6 +74,8 @@ jobs:
           dnf install -y cmake clang pcre-devel
           dnf install -y libglvnd-devel  # fixes missing dependency for Qt in CMake
           dnf install -y p7zip-plugins  # required as fallback for py7zr in Qt installation
+          dnf install -y python3-pip  # fixes missing pip module in jurplel/install-qt-action
+          dnf install -y python3-devel  # fixes building of wheels for jurplel/install-qt-action
           dnf install -y iwyu
           ln -s iwyu_tool.py /usr/bin/iwyu_tool
 
@@ -104,9 +107,18 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           install-deps: false
           cache: true
 
+      - name: Generate macOS mappings
+        if: contains(matrix.os, 'macos')
+        run: |
+          set -x
+
+          wget https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/master/mapgen/iwyu-mapgen-apple-libc.py
+          python3 iwyu-mapgen-apple-libc.py $(xcrun --show-sdk-path)/usr/include > macos.imp
+
       - name: Prepare CMake
         run: |
           # TODO: why does it build dmake in the next step?
@@ -134,14 +146,22 @@ jobs:
         run: |
           # -isystem/usr/lib/clang/17/include
           # TODO: remove -stdlib= - it should have been taken from the compilation database
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -stdlib=${{ matrix.stdlib }} > iwyu.log
+          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -stdlib=${{ matrix.stdlib }} ${{ matrix.mapping_file_opt }} > iwyu.log
 
       - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: Compilation Database (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
+      - uses: actions/upload-artifact@v4
+        if: ${{ contains(matrix.os, 'macos') && (success() || failure()) }}
+        with:
+          name: macOS Mappings
+          path: |
+            ./iwyu-mapgen-apple-libc.py
+            ./macos.imp
+
       - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
@@ -195,6 +215,7 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           install-deps: false
           cache: true
 

.github/workflows/release-windows.yml

@@ -59,7 +59,9 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           tools: 'tools_opensslv3_x64'
+          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
       # TODO: build with multiple threads
       - name: Build x64 release GUI

.github/workflows/scriptcheck.yml

@@ -132,7 +132,9 @@ jobs:
 
       - name: test matchcompiler
         run: |
-          python tools/test_matchcompiler.py
+          python test/tools/test_matchcompiler.py
+        env:
+          PYTHONPATH: ./tools
 
       # 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.9/3.10 contains an unclosed file
@@ -169,21 +171,21 @@ jobs:
 
       - name: test reduce
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/reduce_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/reduce_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_lib
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_lib_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_lib_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_server
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_server_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_server_test.py
           # TODO: why is this file generated? also should be in a temporary folder if possible
-          rm -f tools/donate-cpu-server.log
+          rm -f test/tools/donate-cpu-server.log
         env:
           PYTHONPATH: ./tools
 

.github/workflows/selfcheck.yml

@@ -46,6 +46,7 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           install-deps: false
           cache: true
 

.github/workflows/tsan.yml

@@ -60,6 +60,7 @@ jobs:
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
           cache: true
 
       - name: Install missing Python packages