tests: drop mk-bundle exceptions #17468

vszakats · 2025-05-27T21:24:56Z

Using a mixture of techniques to avoid symbols collisions:

reduce scope.
add t*_ / T*_ prefix.
move shared functions to testutil.c.
(suburl(), rlim2str())
clone re-used lib*.c sources.
(lib587, lib645)
include shared symbols just once in re-used lib*.c sources.
(using LIB*_C guards.)
drop re-used lib*.c sources where they were identical or
unused.
make macros global.
#undef macros before use.

What remain is the entry functions test, and unit_setup,
unit_stop in unit tests.

Also:

fix formatting and other minor things along the way.
add const where possible.
sync some symbol names between tests.
drop mk-bundle-hints.sh that's no longer necessary.

TODO:

enable test bundles by default.

dfandrich

On one hand, it's good that the macro undefs are now explicit and not magic, but on the other hand it's not obvious by looking why they're needed. On balance, less magic is probably more clear.

vszakats · 2025-05-27T22:13:07Z

Possible tweaking options:

prefix SAFETY_MARGIN with Tn_ (2 uses), to avoid the #undefs.
move NUM_HANDLES to test.h, maybe, to avoid most #undefs. It's used in 8 .c source. (Some of them re-used for multiple tests, which makes prefixing less practical in this case).

Then come the other symbols. Where the tricky case is re-used sources:

lib500.c   2x
lib510.c   2x
lib525.c   2x
lib526.c   3x
lib544.c   2x
lib547.c   2x
lib554.c   2x
lib556.c   2x
lib589.c   2x
lib643.c   2x
lib670.c   4x
lib1502.c  4x
lib1514.c  2x
lib1518.c  2x
lib1576.c  2x
lib1594.c  2x
lib1916.c  2x
lib1940.c  2x

After this patch there is no more double/multiple compile of the same libtest source under a different libtest ID. Each libtest is compiled once, and changing behavior at runtime based on test ID. - drop recently added physical clones for two prevously multi-compiled tests: - merge lib587 into lib554 again, branch at runtime. - merge lib645 into lib643 again, branch at runtime. - replace existing dynamic branching to use `testnum` instead of a manually rolled `testno` based on an extra command-line argument. lib1571, lib1576. - mk-bundle.pl: stop defining `LIB*` macros. No longer used. - libtests: drop all `LIB*_C` guards. - Make these tests branch at runtime, stop building copies: - lib585, based on lib500 - lib565, based on lib510 - lib529, based on lib525 - lib527, lib532, based on lib526 - lib545, based on lib544 - lib548, based on lib547 - lib696, based on lib556 - lib584, based on lib589 - lib1539, based on lib1514 - lib1543, based on lib1518 - lib1917, based on lib1916 - lib1946, based on lib1940 - lib671, 672, 673, based on lib670 Follow-up to 02dd471 #17591 Follow-up to 6897aeb #17468 Closes #17598

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 6897aeb #17468 Closes #17590

Using a mixture of techniques to avoid symbols collisions: - reduce scope. - add `t*_` / `T*_` prefix. - move shared functions to `testutil.c`. (`suburl()`, `rlim2str()`) - clone re-used lib*.c sources. (lib587, lib645) - include shared symbols just once in re-used `lib*.c` sources. (using `LIB*_C` guards.) - drop re-used `lib*.c` sources where they were identical or unused. - make macros global. - #undef macros before use. What remain is the entry functions `test`, and `unit_setup`, `unit_stop` in unit tests. Also: - fix formatting and other minor things along the way. - add `const` where possible. - sync some symbol names between tests. - drop `mk-bundle-hints.sh` that's no longer necessary. Closes curl#17468

After this patch there is no more double/multiple compile of the same libtest source under a different libtest ID. Each libtest is compiled once, and changing behavior at runtime based on test ID. - drop recently added physical clones for two prevously multi-compiled tests: - merge lib587 into lib554 again, branch at runtime. - merge lib645 into lib643 again, branch at runtime. - replace existing dynamic branching to use `testnum` instead of a manually rolled `testno` based on an extra command-line argument. lib1571, lib1576. - mk-bundle.pl: stop defining `LIB*` macros. No longer used. - libtests: drop all `LIB*_C` guards. - Make these tests branch at runtime, stop building copies: - lib585, based on lib500 - lib565, based on lib510 - lib529, based on lib525 - lib527, lib532, based on lib526 - lib545, based on lib544 - lib548, based on lib547 - lib696, based on lib556 - lib584, based on lib589 - lib1539, based on lib1514 - lib1543, based on lib1518 - lib1917, based on lib1916 - lib1946, based on lib1940 - lib671, 672, 673, based on lib670 Follow-up to 02dd471 curl#17591 Follow-up to 6897aeb curl#17468 Closes curl#17598

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 6897aeb curl#17468 Closes curl#17590

vszakats added the tests label May 27, 2025

vszakats marked this pull request as draft May 27, 2025 21:25

vszakats added the tidy-up label May 27, 2025

dfandrich approved these changes May 27, 2025

View reviewed changes

This comment was marked as outdated.

Sign in to view

vszakats force-pushed the t-bundle-lessexcp branch from b4a494c to bae721a Compare June 2, 2025 22:32

vszakats changed the title ~~tests: reduce mk-bundle exceptions~~ tests: drop mk-bundle exceptions Jun 3, 2025

vszakats marked this pull request as ready for review June 3, 2025 09:52

vszakats force-pushed the t-bundle-lessexcp branch from 65497ac to d13432e Compare June 5, 2025 07:47

vszakats added 20 commits June 6, 2025 21:57

drop exception HEADER_REQUEST

bc450ed

fix comment

796117a

lib670: reduce scope of a static var

f82ab91

lib650: reduce scope of a static var

746a532

lib650: reduce scope of a static var testname

701f017

replace exceptions with undefs

811fc69

replace exception with undef SAFETY_MARGIN

4bbb732

mk-bundle.pl: drop reused_macros exception logic

8777c4b

move TEST_HANG_TIMEOUT default to test.h

422f1c2

move NUM_HANDLES default to test.h

20f3542

add unique prefixes to SAFETY_MARGIN

1607ca4

lib670: avoid stuct redefinition in test bundle

81f0afd

lib500: avoid local macro (tidy-up)

64725b3

lib510: compile local symbols once

1cd0c95

lib510: prefix symbols

092e93d

lib544: compile local symbols once, drop exception

8fb2e15

lib544: prefix symbols, avoid overwriting original

76c958c

lib547: prefix symbols

49a3fe3

lib554: constify buffer

58f26fc

lib554: split into two, prefix symbols, drop exception

8e5bf57

vszakats added 20 commits June 7, 2025 10:29

lib1940: reduce scope, drop prefix (testdata)

8425675

lib1662: reduce scope, constify, drop prefix (testdata)

f1770d3

lib1560: whitespace

ca3ba1f

lib1901: reduce scope

9f4b79c

lib578: whitespace

3d70f55

lib579: whitespace

b357a78

lib554: whitespace

8ffeb66

lib571: reduce scope

a673eaf

formatting

02ab200

lib1520: reduce scope

b11631c

lib1531: reduce scope

e085195

lib1522: reduce scope

b93b8a1

lib1598: reduce scope

7a5a2c0

lib1915: reduce scope

861b415

lib1915: reduce scope (type)

bc0be7d

lib506: drop static var

e98677e

testtrace: checksrc

6fd6ca8

lib517: reduce scope

c1209a3

lib555: formatting

8d1e0db

lib655: formatting

adcbbde

vszakats closed this in 6897aeb Jun 11, 2025

vszakats deleted the t-bundle-lessexcp branch June 11, 2025 03:40

This was referenced Jun 11, 2025

tests: always make bundles, adapt build and tests #17590

Closed

libtests: stop building the sames source multiple times #17598

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

tests: drop mk-bundle exceptions #17468

tests: drop mk-bundle exceptions #17468

Uh oh!

vszakats commented May 27, 2025 •

edited

Loading

Uh oh!

dfandrich left a comment

Uh oh!

vszakats commented May 27, 2025 •

edited

Loading

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

tests: drop mk-bundle exceptions #17468

tests: drop mk-bundle exceptions #17468

Uh oh!

Conversation

vszakats commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dfandrich left a comment

Choose a reason for hiding this comment

Uh oh!

vszakats commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

vszakats commented May 27, 2025 •

edited

Loading

vszakats commented May 27, 2025 •

edited

Loading