]> git.ipfire.org Git - thirdparty/curl.git/commit
tests: always make bundles, adapt build and tests
authorViktor Szakats <commit@vsz.me>
Wed, 11 Jun 2025 09:31:14 +0000 (11:31 +0200)
committerViktor Szakats <commit@vsz.me>
Sat, 14 Jun 2025 19:08:23 +0000 (21:08 +0200)
commit2c27a67daa1b76859c18d63e4e1f528db05b5e13
tree1b45ee071d613c496f01b7e1e9fe4460e7ec8ba1
parent1cdac95e2e1022c298c1e4e551c7e8b5bd8fd5df
tests: always make bundles, adapt build and tests

Make test bundles the default. Drop non-bundle build mode.
Also do all the optimizations and tidy-ups this allows, simpler builds,
less bundle exceptions, streamlined build mechanics.

Also rework the init/deinit macro magic for unit tests. The new method
allows using unique init/deinit function names, and calling them with
arguments. This is in turn makes it possible to reduce the use of global
variables.

Note this drop existing build options `-DCURL_TEST_BUNDLES=` from cmake
and `--enable-test-bundles` / `--disable-test-bundles` from autotools.

Also:
- rename test entry functions to have unique names: `test_<testname>`
  This removes the last exception that was handled in the generator.
- fix `make dist` to not miss test sources with test bundles enabled.
- sync and merge `tests/mk-bundle.pl` into `scripts/mk-unity.pl`.
- mk-unity.pl: add `--embed` option and use it when `CURL_CLANG_TIDY=ON`
  to ensure that `clang-tidy` does not miss external test C sources.
  (because `clang-tidy` ignores code that's #included.)
- tests/unit: drop no-op setup/stop functions.
- tests: reduce symbol scopes, global macros, other fixes and tidy-ups.
- tool1621: fix to run, also fix it to pass.
- sockfilt: fix Windows compiler warning in certain unity include order,
  by explicitly including `warnless.h`.

Follow-up to 6897aeb10561b55c6659866fc0518dd67422f267 #17468

Closes #17590
386 files changed:
.github/workflows/http3-linux.yml
.github/workflows/linux-old.yml
.github/workflows/linux.yml
.github/workflows/macos.yml
.github/workflows/non-native.yml
.github/workflows/windows.yml
CMakeLists.txt
appveyor.sh
configure.ac
docs/INSTALL-CMAKE.md
docs/cmdline-opts/CMakeLists.txt
docs/cmdline-opts/Makefile.am
docs/cmdline-opts/Makefile.inc
docs/examples/CMakeLists.txt
docs/examples/Makefile.am
docs/examples/Makefile.inc
docs/libcurl/CMakeLists.txt
docs/libcurl/Makefile.am
docs/libcurl/Makefile.inc
docs/libcurl/opts/CMakeLists.txt
docs/libcurl/opts/Makefile.am
docs/libcurl/opts/Makefile.inc
docs/tests/TEST-SUITE.md
lib/CMakeLists.txt
lib/Makefile.am
lib/Makefile.inc
lib/Makefile.soname
scripts/mk-unity.pl
src/CMakeLists.txt
src/Makefile.am
src/Makefile.inc
src/tool_setup.h
src/tool_xattr.c
src/tool_xattr.h
tests/Makefile.am
tests/certs/CMakeLists.txt
tests/certs/Makefile.am
tests/certs/Makefile.inc
tests/data/test1306
tests/data/test1621
tests/data/test2023
tests/data/test2024
tests/data/test2025
tests/data/test2026
tests/data/test2027
tests/data/test2028
tests/data/test2029
tests/data/test2030
tests/data/test2031
tests/data/test2032
tests/data/test2082
tests/data/test2083
tests/data/test2084
tests/data/test2085
tests/data/test2086
tests/globalconfig.pm
tests/http/clients/CMakeLists.txt
tests/http/clients/Makefile.am
tests/http/clients/Makefile.inc
tests/libtest/.gitignore
tests/libtest/CMakeLists.txt
tests/libtest/Makefile.am
tests/libtest/Makefile.inc
tests/libtest/first.c
tests/libtest/first.h
tests/libtest/lib1156.c
tests/libtest/lib1301.c
tests/libtest/lib1308.c
tests/libtest/lib1485.c
tests/libtest/lib1500.c
tests/libtest/lib1501.c
tests/libtest/lib1502.c
tests/libtest/lib1506.c
tests/libtest/lib1507.c
tests/libtest/lib1508.c
tests/libtest/lib1509.c
tests/libtest/lib1510.c
tests/libtest/lib1511.c
tests/libtest/lib1512.c
tests/libtest/lib1513.c
tests/libtest/lib1514.c
tests/libtest/lib1515.c
tests/libtest/lib1517.c
tests/libtest/lib1518.c
tests/libtest/lib1520.c
tests/libtest/lib1522.c
tests/libtest/lib1523.c
tests/libtest/lib1525.c
tests/libtest/lib1526.c
tests/libtest/lib1527.c
tests/libtest/lib1528.c
tests/libtest/lib1529.c
tests/libtest/lib1530.c
tests/libtest/lib1531.c
tests/libtest/lib1532.c
tests/libtest/lib1533.c
tests/libtest/lib1534.c
tests/libtest/lib1535.c
tests/libtest/lib1536.c
tests/libtest/lib1537.c
tests/libtest/lib1538.c
tests/libtest/lib1540.c
tests/libtest/lib1541.c
tests/libtest/lib1542.c
tests/libtest/lib1545.c
tests/libtest/lib1550.c
tests/libtest/lib1551.c
tests/libtest/lib1552.c
tests/libtest/lib1553.c
tests/libtest/lib1554.c
tests/libtest/lib1555.c
tests/libtest/lib1556.c
tests/libtest/lib1557.c
tests/libtest/lib1558.c
tests/libtest/lib1559.c
tests/libtest/lib1560.c
tests/libtest/lib1564.c
tests/libtest/lib1565.c
tests/libtest/lib1567.c
tests/libtest/lib1568.c
tests/libtest/lib1569.c
tests/libtest/lib1571.c
tests/libtest/lib1576.c
tests/libtest/lib1591.c
tests/libtest/lib1592.c
tests/libtest/lib1593.c
tests/libtest/lib1594.c
tests/libtest/lib1597.c
tests/libtest/lib1598.c
tests/libtest/lib1662.c
tests/libtest/lib1900.c
tests/libtest/lib1901.c
tests/libtest/lib1903.c
tests/libtest/lib1905.c
tests/libtest/lib1906.c
tests/libtest/lib1907.c
tests/libtest/lib1908.c
tests/libtest/lib1910.c
tests/libtest/lib1911.c
tests/libtest/lib1912.c
tests/libtest/lib1913.c
tests/libtest/lib1915.c
tests/libtest/lib1916.c
tests/libtest/lib1918.c
tests/libtest/lib1919.c
tests/libtest/lib1933.c
tests/libtest/lib1934.c
tests/libtest/lib1935.c
tests/libtest/lib1936.c
tests/libtest/lib1937.c
tests/libtest/lib1938.c
tests/libtest/lib1939.c
tests/libtest/lib1940.c
tests/libtest/lib1945.c
tests/libtest/lib1947.c
tests/libtest/lib1948.c
tests/libtest/lib1955.c
tests/libtest/lib1956.c
tests/libtest/lib1957.c
tests/libtest/lib1958.c
tests/libtest/lib1959.c
tests/libtest/lib1960.c
tests/libtest/lib1964.c
tests/libtest/lib1970.c
tests/libtest/lib1971.c
tests/libtest/lib1972.c
tests/libtest/lib1973.c
tests/libtest/lib1974.c
tests/libtest/lib1975.c
tests/libtest/lib1977.c
tests/libtest/lib1978.c
tests/libtest/lib2023.c [moved from tests/libtest/libauthretry.c with 89% similarity]
tests/libtest/lib2032.c [moved from tests/libtest/libntlmconnect.c with 92% similarity]
tests/libtest/lib2082.c [moved from tests/libtest/libprereq.c with 98% similarity]
tests/libtest/lib2301.c
tests/libtest/lib2302.c
tests/libtest/lib2304.c
tests/libtest/lib2306.c
tests/libtest/lib2308.c
tests/libtest/lib2309.c
tests/libtest/lib2402.c
tests/libtest/lib2404.c
tests/libtest/lib2405.c
tests/libtest/lib2502.c
tests/libtest/lib2700.c
tests/libtest/lib3010.c
tests/libtest/lib3025.c
tests/libtest/lib3026.c
tests/libtest/lib3027.c
tests/libtest/lib3100.c
tests/libtest/lib3101.c
tests/libtest/lib3102.c
tests/libtest/lib3103.c
tests/libtest/lib3104.c
tests/libtest/lib3105.c
tests/libtest/lib3207.c
tests/libtest/lib3208.c
tests/libtest/lib500.c
tests/libtest/lib501.c
tests/libtest/lib502.c
tests/libtest/lib503.c
tests/libtest/lib504.c
tests/libtest/lib505.c
tests/libtest/lib506.c
tests/libtest/lib507.c
tests/libtest/lib508.c
tests/libtest/lib509.c
tests/libtest/lib510.c
tests/libtest/lib511.c
tests/libtest/lib512.c
tests/libtest/lib513.c
tests/libtest/lib514.c
tests/libtest/lib515.c
tests/libtest/lib516.c
tests/libtest/lib517.c
tests/libtest/lib518.c
tests/libtest/lib519.c
tests/libtest/lib520.c
tests/libtest/lib521.c
tests/libtest/lib523.c
tests/libtest/lib524.c
tests/libtest/lib525.c
tests/libtest/lib526.c
tests/libtest/lib530.c
tests/libtest/lib533.c
tests/libtest/lib536.c
tests/libtest/lib537.c
tests/libtest/lib539.c
tests/libtest/lib540.c
tests/libtest/lib541.c
tests/libtest/lib542.c
tests/libtest/lib543.c
tests/libtest/lib544.c
tests/libtest/lib547.c
tests/libtest/lib549.c
tests/libtest/lib552.c
tests/libtest/lib553.c
tests/libtest/lib554.c
tests/libtest/lib555.c
tests/libtest/lib556.c
tests/libtest/lib557.c
tests/libtest/lib558.c
tests/libtest/lib559.c
tests/libtest/lib560.c
tests/libtest/lib562.c
tests/libtest/lib564.c
tests/libtest/lib566.c
tests/libtest/lib567.c
tests/libtest/lib568.c
tests/libtest/lib569.c
tests/libtest/lib570.c
tests/libtest/lib571.c
tests/libtest/lib572.c
tests/libtest/lib573.c
tests/libtest/lib574.c
tests/libtest/lib575.c
tests/libtest/lib576.c
tests/libtest/lib578.c
tests/libtest/lib579.c
tests/libtest/lib582.c
tests/libtest/lib583.c
tests/libtest/lib586.c
tests/libtest/lib589.c
tests/libtest/lib590.c
tests/libtest/lib591.c
tests/libtest/lib597.c
tests/libtest/lib598.c
tests/libtest/lib599.c
tests/libtest/lib643.c
tests/libtest/lib650.c
tests/libtest/lib651.c
tests/libtest/lib652.c
tests/libtest/lib653.c
tests/libtest/lib654.c
tests/libtest/lib655.c
tests/libtest/lib658.c
tests/libtest/lib659.c
tests/libtest/lib661.c
tests/libtest/lib666.c
tests/libtest/lib667.c
tests/libtest/lib668.c
tests/libtest/lib670.c
tests/libtest/lib674.c
tests/libtest/lib676.c
tests/libtest/lib677.c
tests/libtest/lib678.c
tests/libtest/lib694.c
tests/libtest/lib695.c
tests/libtest/lib751.c
tests/libtest/mk-lib1521.pl
tests/libtest/test.h
tests/libtest/testtrace.c
tests/mk-bundle.pl [deleted file]
tests/runner.pm
tests/runtests.pl
tests/server/.gitignore
tests/server/CMakeLists.txt
tests/server/Makefile.am
tests/server/Makefile.inc
tests/server/dnsd.c
tests/server/first.c
tests/server/first.h
tests/server/getpart.c
tests/server/getpart.h
tests/server/mk-bundle.pl [deleted file]
tests/server/mqttd.c
tests/server/resolve.c
tests/server/rtspd.c
tests/server/server_setup.h [deleted file]
tests/server/server_sockaddr.h [deleted file]
tests/server/sockfilt.c
tests/server/socksd.c
tests/server/sws.c
tests/server/tftp.h [deleted file]
tests/server/tftpd.c
tests/server/util.c
tests/server/util.h
tests/serverhelp.pm
tests/tunit/.gitignore
tests/tunit/CMakeLists.txt
tests/tunit/Makefile.am
tests/tunit/Makefile.inc
tests/tunit/tool1394.c
tests/tunit/tool1604.c
tests/tunit/tool1621.c
tests/unit/.gitignore
tests/unit/CMakeLists.txt
tests/unit/Makefile.am
tests/unit/Makefile.inc
tests/unit/README.md
tests/unit/curlcheck.h
tests/unit/unit1300.c
tests/unit/unit1302.c
tests/unit/unit1303.c
tests/unit/unit1304.c
tests/unit/unit1305.c
tests/unit/unit1307.c
tests/unit/unit1309.c
tests/unit/unit1323.c
tests/unit/unit1330.c
tests/unit/unit1395.c
tests/unit/unit1396.c
tests/unit/unit1397.c
tests/unit/unit1398.c
tests/unit/unit1399.c
tests/unit/unit1600.c
tests/unit/unit1601.c
tests/unit/unit1602.c
tests/unit/unit1603.c
tests/unit/unit1605.c
tests/unit/unit1606.c
tests/unit/unit1607.c
tests/unit/unit1608.c
tests/unit/unit1609.c
tests/unit/unit1610.c
tests/unit/unit1611.c
tests/unit/unit1612.c
tests/unit/unit1614.c
tests/unit/unit1615.c
tests/unit/unit1616.c
tests/unit/unit1620.c
tests/unit/unit1650.c
tests/unit/unit1651.c
tests/unit/unit1652.c
tests/unit/unit1653.c
tests/unit/unit1654.c
tests/unit/unit1655.c
tests/unit/unit1656.c
tests/unit/unit1657.c
tests/unit/unit1658.c
tests/unit/unit1660.c
tests/unit/unit1661.c
tests/unit/unit1663.c
tests/unit/unit1664.c
tests/unit/unit1979.c
tests/unit/unit1980.c
tests/unit/unit2600.c
tests/unit/unit2601.c
tests/unit/unit2602.c
tests/unit/unit2603.c
tests/unit/unit2604.c
tests/unit/unit3200.c
tests/unit/unit3205.c
tests/unit/unit3211.c
tests/unit/unit3212.c
tests/unit/unit3213.c