tests: speed up builds with single-binary test bundles

Add support for single-block binaries that contain all libtests and unit tests respectively. Enable with: - autotools: `--enable-test-bundles` - cmake: `-DCURL_TEST_BUNDLES=ON` (They are compatible with `--enable-unity` and `-DCMAKE_UNITY_BUILD=ON` options, for further speed-up.) Makes libtests and unit tests build _fast_, needing little disk space even in static mode. Similar to CMake unity mode, but with a custom script, also supporting autotools builds. The price is having to deal with symbols/macros colliding between `lib*.c` and `unit*.c` sources. Maybe with naming conventions or other solutions this can be improved gradually and reduce the need for manual intervention by `mk-bundle.mk`. I've included a script that does the bulk of detecting name collisions. Also: - CI: enable test bundles. - CI: build tests in more jobs. - lib2305: fix FILE handle leak. - unit1661: fix memleak found by torture test by releasing the `bufref` structure in `unit_stop()` that was allocated in `unit_setup()`. ``` test 1661...[bufref unit tests] Leak detected: memory still allocated: 13 bytes allocated by /home/runner/work/curl/curl/tests/unit/unit1661.c:70 1661: torture FAILED: function number 1 in test. ``` Ref: https://github.com/curl/curl/actions/runs/10967279334/job/30456745290?pr=14772#step:8:41 Similar test suite builds with autotools default and cmake+bundle+unity: - GHA/Linux: 33s vs 7s https://github.com/curl/curl/actions/runs/10705668823/job/29681617374 - GHA/macOS 34s vs 2s https://github.com/curl/curl/actions/runs/10705668813/job/29681632885 - GHA/FreeBSD: 15m25 vs 6m21 (full workflow time, ~qemu) https://github.com/curl/curl/actions/runs/10705668811/job/29681607915 - GHA/Cygwin: 9m52 vs 32s https://github.com/curl/curl/actions/runs/10705668809/job/29681609965 - GHA/MSYS2: 3m52 vs 14s https://github.com/curl/curl/actions/runs/10705668808/job/29681624295 - GHA/mingw-w64: 5m45 vs 30s https://github.com/curl/curl/actions/runs/10705668808/job/29681628787 Autotools test suite builds compared between master -> `--enable-test-bundles`: - GHA/Linux: 33s -> 9s (run tests: 22m23 -> 20m44) https://github.com/curl/curl/actions/runs/10710030193/job/29695932185 https://github.com/curl/curl/actions/runs/10967831456/job/30458220344 - GHA/macOS: 25s -> 4s (run tests: 2m58 -> 2m24) https://github.com/curl/curl/actions/runs/10710030195/job/29695938444 https://github.com/curl/curl/actions/runs/10967831452/job/30458225762 - GHA/non-native (FreeBSD): 4m8 -> 3m12 (full workflow time, ~qemu) https://github.com/curl/curl/actions/runs/10710030198/job/29695928401 https://github.com/curl/curl/actions/runs/10967831458/job/30458212692 - GHA/Cygwin: 9m25 -> 1m9 (run tests: 9m19 -> 3m28) https://github.com/curl/curl/actions/runs/10710030212/job/29695928213 https://github.com/curl/curl/actions/runs/10967831453/job/30458213268 - GHA/MSYS2: 3m54 -> 32s (run tests: 6m3 -> 3m59) https://github.com/curl/curl/actions/runs/10710030190/job/29704850591 https://github.com/curl/curl/actions/runs/10967831449/job/30459280005 - GHA/mingw-w64: 5m42 -> 1m5 (run tests: 7m41 -> 5m36) https://github.com/curl/curl/actions/runs/10710030190/job/29704852058 https://github.com/curl/curl/actions/runs/10967831449/job/30459280862 - Azure MSYS2 mingw64 openssl: 38m55 -> 11m58 https://dev.azure.com/daniel0244/curl/_build/results?buildId=25546&view=logs&j=b58b8c59-0f61-52e9-0f9e-fad562a1e77f&t=0f9230a7-3b10-53ca-9938-700ece377c5e https://dev.azure.com/daniel0244/curl/_build/results?buildId=25547&view=logs&jobId=39473db1-3945-55d5-deb5-c218fad88dce&j=b58b8c59-0f61-52e9-0f9e-fad562a1e77f&t=0f9230a7-3b10-53ca-9938-700ece377c5e - Azure Ubuntu default: 2m15 -> 55s (all build) https://dev.azure.com/daniel0244/curl/_build/results?buildId=25546&view=logs&j=9d58b9ac-e1e6-53b6-f83a-1f9f1d912522&t=a6b38d83-e7cf-5a9b-c762-a178412717b7 https://dev.azure.com/daniel0244/curl/_build/results?buildId=25547&view=logs&jobId=39473db1-3945-55d5-deb5-c218fad88dce&j=9d58b9ac-e1e6-53b6-f83a-1f9f1d912522&t=a6b38d83-e7cf-5a9b-c762-a178412717b7 Cmake test suite builds compared between master -> `-DCURL_TEST_BUNDLES=ON` + unity: - GHA/Linux: 29s -> 7s (run tests: 4m50 -> 4m57, 20m43 -> 20m45) https://github.com/curl/curl/actions/runs/10710030193/job/29695941814 https://github.com/curl/curl/actions/runs/10705668823/job/29681622201 - GHA/Linux old: 44s -> 13s (bundle+no unity) (run tests: 5m5 -> 5m6) https://github.com/curl/curl/actions/runs/10718264094/job/29719794727 https://github.com/curl/curl/actions/runs/10718653175/job/29721009613 - GHA/macOS: 32s -> 2s (run tests: 2m43 -> 2m40) https://github.com/curl/curl/actions/runs/10710030195/job/29695931956 https://github.com/curl/curl/actions/runs/10705668813/job/29681638937 - GHA/non-native (*BSD): inconclusive (full workflow time, ~qemu) https://github.com/curl/curl/actions/runs/10710030198 https://github.com/curl/curl/actions/runs/10705668811 - GHA/Cygwin: 3m9 -> 32s https://github.com/curl/curl/actions/runs/10710030212/job/29695929075 https://github.com/curl/curl/actions/runs/10705668809/job/29681609965 - GHA/MSYS2: 2m24 -> 14s https://github.com/curl/curl/actions/runs/10710030190/job/29704850996 https://github.com/curl/curl/actions/runs/10705668808/job/29681624295 - GHA/mingw-w64: 3m56 -> 30s (run tests: 4m2 -> 3m52) https://github.com/curl/curl/actions/runs/10710030190/job/29704852219 https://github.com/curl/curl/actions/runs/10705668808/job/29681631393 - GHA/mingw-w64-old: 7m19 -> 1m44 (run tests: 3m30 -> 2m53) https://github.com/curl/curl/actions/runs/10710030190/job/29704849763 https://github.com/curl/curl/actions/runs/10705668808/job/29681622329 - GHA/MSVC: 3m22 -> 13s (run tests: 9m43 -> 4m22) https://github.com/curl/curl/actions/runs/10710030190/job/29704850411 https://github.com/curl/curl/actions/runs/10705668808/job/29681623313 - AppVeyor CI MSVC 2008: 4m3 -> 45s (full build) - AppVeyor CI MSVC 2010: 2m56 -> 1m8 (full build) - AppVeyor CI MSVC 2022: 10m19 -> 2m23 (full build) https://ci.appveyor.com/project/curlorg/curl/builds/50538455 https://ci.appveyor.com/project/curlorg/curl/builds/50536558 - AppVeyor CI total build time: 10m30 (master) -> 6m48 (unity) -> 4m5 (bundle) -> 3m24 (bundle+unity) -> 5m7 (bundle+unity+all jobs building tests) Closes #14772
2026-06-04 18:14:14 +03:00 · 2024-09-02 14:46:00 +02:00 · 2024-09-02 14:46:00 +02:00 · 71cf0d1fca
commit 71cf0d1fca
parent 6a1dcdc5d2
86 changed files with 1008 additions and 497 deletions
--- a/.github/workflows/awslc.yml
+++ b/.github/workflows/awslc.yml
@ -142,7 +142,9 @@ jobs:

      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

-      - run: cmake -Bbuild -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DOPENSSL_ROOT_DIR=$HOME/awslc -DBUILD_SHARED_LIBS=ON .
+      - run: |
+          cmake -B build -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
+            -DOPENSSL_ROOT_DIR=$HOME/awslc -DBUILD_SHARED_LIBS=ON
        name: 'cmake generate out-of-tree'

      - run: cmake --build build --parallel
@ -150,3 +152,6 @@ jobs:

      - run: cmake --install build --prefix $HOME/curl --strip
        name: 'cmake install'
+
+      - run: cmake --build build --parallel --target testdeps
+        name: 'cmake build tests'
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@ -81,7 +81,7 @@ jobs:
        timeout-minutes: 5
        run: |
          PATH="/usr/bin:$(cygpath "${SYSTEMROOT}")/System32"
-          mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \
+          mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            --prefix="${HOME}"/install \
            --enable-websockets \
            --with-openssl \
@ -139,7 +139,7 @@ jobs:
        run: |
          PATH="/usr/bin:$(cygpath "${SYSTEMROOT}")/System32"
          cmake -B bld -G Ninja ${options} \
-            -DCMAKE_UNITY_BUILD=ON \
+            -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
            -DCURL_WERROR=ON \
            -DENABLE_WEBSOCKETS=ON \
            -DCURL_BROTLI=ON \
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@ -451,7 +451,7 @@ jobs:
      - run: autoreconf -fi
        name: 'autoreconf'

-      - run: ./configure --disable-dependency-tracking --enable-unity ${{ matrix.build.configure }}
+      - run: ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles ${{ matrix.build.configure }}
        name: 'configure'

      - run: make V=1
--- a/.github/workflows/linux-old.yml
+++ b/.github/workflows/linux-old.yml
@ -79,7 +79,7 @@ jobs:
        run: |
          mkdir bld-1
          cd bld-1
-          cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
+          cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
            -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON -DENABLE_WEBSOCKETS=ON
          make install
          src/curl --disable --version
@ -88,7 +88,7 @@ jobs:
        run: |
          mkdir bld-cares
          cd bld-cares
-          cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
+          cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
            -DENABLE_ARES=ON -DCURL_ZSTD=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON -DUSE_LIBRTMP=ON -DENABLE_WEBSOCKETS=ON \
            -DCURL_LIBCURL_VERSIONED_SYMBOLS=ON

@ -113,7 +113,7 @@ jobs:
        run: |
          mkdir bld-am
          cd bld-am
-          ../configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror \
+          ../configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            --with-openssl --enable-ares --with-libssh --with-zstd --with-gssapi --with-librtmp --enable-websockets \
            --prefix="$PWD"/../install-am

--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -498,7 +498,7 @@ jobs:

      - run: |
          ${{ matrix.build.configure-prefix }} \
-          ./configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror \
+          ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            ${{ matrix.build.configure }}
        if: ${{ matrix.build.configure }}
        name: 'configure (autotools)'
--- a/.github/workflows/linux32.yml
+++ b/.github/workflows/linux32.yml
@ -70,7 +70,7 @@ jobs:
        name: 'autoreconf'

      - run: |
-          ./configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror \
+          ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            ${{ matrix.build.configure }}
        name: 'configure'

--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -193,7 +193,7 @@ jobs:
            options+=" --with-sysroot=$(xcrun --sdk macosx --show-sdk-path 2>/dev/null)"
            CFLAGS+=" --sysroot=$(xcrun --sdk macosx --show-sdk-path 2>/dev/null)"
          fi
-          mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \
+          mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            --disable-dependency-tracking \
            --with-libpsl=$(brew --prefix libpsl) \
            ${{ matrix.configure }} ${options}
@ -343,7 +343,7 @@ jobs:
              fi
            done
          fi
-          cmake -B bld -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
+          cmake -B bld -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
            -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.build.macos-version-min }} \
            "-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
            ${{ matrix.build.generate }}
@ -608,7 +608,7 @@ jobs:
            [ '${{ matrix.config }}' = 'SecureTransport' ] && options+=' --with-secure-transport'
            CFLAGS+=' -mmacosx-version-min=${{ matrix.macos-version-min }}'
            # would pick up nghttp2, libidn2, but libssh2 is disabled by default
-            mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \
+            mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
              --disable-dependency-tracking \
              --disable-docs --disable-manual \
              --without-nghttp2 --without-libidn2 \
@ -618,7 +618,7 @@ jobs:
            [ '${{ matrix.config }}' = 'OpenSSL' ]         && options+=' -DCURL_USE_OPENSSL=ON'
            [ '${{ matrix.config }}' = 'SecureTransport' ] && options+=' -DCURL_USE_SECTRANSP=ON'
            # would pick up nghttp2, libidn2, and libssh2
-            cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
+            cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
              -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.macos-version-min }} \
              "-DCMAKE_IGNORE_PREFIX_PATH=$(brew --prefix)" \
              "-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@ -55,7 +55,7 @@ jobs:
            # https://pkgsrc.se/
            sudo pkgin -y install cmake ninja-build pkg-config perl brotli heimdal openldap-client libssh2 libidn2 libpsl nghttp2 py311-impacket
            cmake -B bld -G Ninja \
-              -DCMAKE_UNITY_BUILD=ON \
+              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DENABLE_WEBSOCKETS=ON \
@ -64,8 +64,8 @@ jobs:
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            cmake --build bld --config Debug --parallel 3
            bld/src/curl --disable --version
+            cmake --build bld --config Debug --parallel 3 --target testdeps
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              cmake --build bld --config Debug --parallel 3 --target testdeps
              export TFLAGS='-j0'  # flakies: ~389 ~392 ~TFTP and more
              cmake --build bld --config Debug --target test-ci
            fi
@ -92,7 +92,7 @@ jobs:
            # https://openbsd.app/
            sudo pkg_add cmake ninja perl brotli openldap-client libssh2 libidn2 libpsl nghttp2 python3 py3-impacket
            cmake -B bld -G Ninja \
-              -DCMAKE_UNITY_BUILD=ON \
+              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DENABLE_WEBSOCKETS=ON \
@ -101,8 +101,8 @@ jobs:
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            cmake --build bld --config Debug --parallel 3
            bld/src/curl --disable --version
+            cmake --build bld --config Debug --parallel 3 --target testdeps
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              cmake --build bld --config Debug --parallel 3 --target testdeps
              export TFLAGS='-j8 ~3017 ~TFTP ~FTP'  # FIXME: TFTP requests executed twice? Related: `curl: (69) TFTP: Access Violation`?
              cmake --build bld --config Debug --target test-ci
            fi
@ -136,7 +136,7 @@ jobs:
              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket
            autoreconf -fi
            export CC='${{ matrix.compiler }}'
-            mkdir bld && cd bld && ../configure --enable-unity --enable-debug --enable-warnings --enable-werror \
+            mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \
              --prefix="${HOME}"/install \
              --enable-websockets \
              --with-openssl \
@ -144,8 +144,8 @@ jobs:
              --disable-dependency-tracking || { tail -n 1000 config.log; false; }
            make -j3 install
            src/curl --disable --version
+            make -j3 -C tests
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              make -j3 -C tests
              make test-ci V=1 TFLAGS='-j8 ~FTP'
            fi
            echo '::group::build examples'
@ -165,7 +165,7 @@ jobs:
              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket
            cmake -B bld -G Ninja \
              '-DCMAKE_C_COMPILER=${{ matrix.compiler }}' \
-              -DCMAKE_UNITY_BUILD=ON \
+              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DENABLE_WEBSOCKETS=ON \
@ -174,8 +174,8 @@ jobs:
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            cmake --build bld --config Debug --parallel 3
            bld/src/curl --disable --version
+            cmake --build bld --config Debug --parallel 3 --target testdeps
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              cmake --build bld --config Debug --parallel 3 --target testdeps
              export TFLAGS='-j8 ~FTP'
              cmake --build bld --config Debug --target test-ci
            fi
@ -198,7 +198,7 @@ jobs:
          run: |
            ln -s /usr/bin/gcpp /usr/bin/cpp  # Some tests expect `cpp`, which is named `gcpp` in this env.
            autoreconf -fi
-            mkdir bld && cd bld && ../configure --enable-unity --enable-debug --enable-warnings --enable-werror \
+            mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \
              --prefix="${HOME}"/install \
              --enable-websockets \
              --with-openssl \
--- a/.github/workflows/torture.yml
+++ b/.github/workflows/torture.yml
@ -69,7 +69,7 @@ jobs:
      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

      - run: |
-          cmake -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON \
+          cmake -G Ninja -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
            -DCURL_BROTLI=ON -DCURL_ZSTD=ON \
            ${{ matrix.build.generate }}
        name: 'cmake configure'
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -103,7 +103,7 @@ jobs:
        if: ${{ matrix.build == 'autotools' }}
        timeout-minutes: 5
        run: |
-          mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \
+          mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            --prefix="${HOME}"/install \
            --enable-websockets \
            --with-openssl \
@ -196,7 +196,7 @@ jobs:
            "-DCMAKE_C_FLAGS=${cflags}" \
            "-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \
            '-DCMAKE_BUILD_TYPE=${{ matrix.type }}' \
-            -DCMAKE_UNITY_BUILD=ON \
+            -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
            -DCURL_WERROR=ON \
            -DENABLE_WEBSOCKETS=ON \
            -DCURL_BROTLI=ON \
@ -329,7 +329,7 @@ jobs:
            '-GMSYS Makefiles' \
            -DCMAKE_C_COMPILER=gcc \
            '-DCMAKE_BUILD_TYPE=${{ matrix.type }}' \
-            -DCMAKE_UNITY_BUILD=ON \
+            -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
            -DCURL_WERROR=ON \
            -DENABLE_WEBSOCKETS=ON \
            -DCURL_USE_LIBPSL=OFF \
@ -415,7 +415,7 @@ jobs:
      - name: 'autotools configure'
        if: ${{ matrix.build == 'autotools' }}
        run: |
-          mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \
+          mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
            --host=${TRIPLET} \
            --with-schannel --with-winidn \
            --without-libpsl \
@ -429,6 +429,10 @@ jobs:
        if: ${{ matrix.build == 'autotools' }}
        run: make -C bld -j5

+      - name: 'autotools build tests'
+        if: ${{ matrix.build == 'autotools' }}
+        run: make -C bld -j5 -C tests
+
      - name: 'autotools build examples'
        if: ${{ matrix.build == 'autotools' }}
        run: make -C bld -j5 examples
@ -440,7 +444,7 @@ jobs:
            -DCMAKE_SYSTEM_NAME=Windows \
            -DCMAKE_C_COMPILER_TARGET=${TRIPLET} \
            -DCMAKE_C_COMPILER=${TRIPLET}-gcc \
-            -DCMAKE_UNITY_BUILD=ON \
+            -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
            -DCURL_WERROR=ON \
            -DCURL_USE_SCHANNEL=ON -DUSE_WIN32_IDN=ON \
            -DCURL_USE_LIBPSL=OFF
@ -453,6 +457,10 @@ jobs:
        if: ${{ matrix.build == 'cmake' }}
        run: cmake --build bld --parallel 5

+      - name: 'cmake build tests'
+        if: ${{ matrix.build == 'cmake' }}
+        run: cmake --build bld --parallel 5 --target testdeps
+
      - name: 'cmake build examples'
        if: ${{ matrix.build == 'cmake' }}
        run: cmake --build bld --parallel 5 --target curl-examples
@ -565,7 +573,7 @@ jobs:
            '-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-${{ matrix.plat }}' \
            -DCMAKE_VS_GLOBALS=TrackFileAccess=false \
            '-DCMAKE_BUILD_TYPE=${{ matrix.type }}' \
-            -DCMAKE_UNITY_BUILD=ON \
+            -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
            -DCURL_WERROR=ON \
            -DENABLE_WEBSOCKETS=ON \
            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@ -84,7 +84,7 @@ jobs:
      - run: autoreconf -fi
        name: 'autoreconf'

-      - run: ./configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror ${{ matrix.build.configure }}
+      - run: ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror ${{ matrix.build.configure }}
        name: 'configure'

      - run: make V=1