romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 08:13:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: always make bundles, adapt build and tests

Browse source 
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 6897aeb105 #17468

Closes #17590
This commit is contained in:
Viktor Szakats 2025-06-11 11:31:14 +02:00
parent 1cdac95e2e
commit 2c27a67daa
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
386 changed files with 2996 additions and 4164 deletions
Download patch file Download diff file Expand all files Collapse all files

75
tests/unit/unit1656.c
View file

@ -25,16 +25,6 @@
#include "vtls/x509asn1.h"
static CURLcode unit_setup(void)
{
return CURLE_OK;
}
static void unit_stop(void)
{
}
#if defined(USE_GNUTLS) || defined(USE_SCHANNEL) || defined(USE_MBEDTLS)
struct test_spec {
@ -43,7 +33,34 @@ struct test_spec {
CURLcode exp_result;
};
static struct test_spec test_specs[] = {
static bool do_test(const struct test_spec *spec, size_t i,
struct dynbuf *dbuf)
{
CURLcode result;
const char *in = spec->input;
curlx_dyn_reset(dbuf);
result = Curl_x509_GTime2str(dbuf, in, in + strlen(in));
if(result != spec->exp_result) {
curl_mfprintf(stderr, "test %zu: expect result %d, got %d\n",
i, spec->exp_result, result);
return FALSE;
}
else if(!result && strcmp(spec->exp_output, curlx_dyn_ptr(dbuf))) {
curl_mfprintf(stderr,
"test %zu: input '%s', expected output '%s', got '%s'\n",
i, in, spec->exp_output, curlx_dyn_ptr(dbuf));
return FALSE;
}
return TRUE;
}
static CURLcode test_unit1656(char *arg)
{
UNITTEST_BEGIN_SIMPLE
static const struct test_spec test_specs[] = {
{ "190321134340", "1903-21-13 43:40:00", CURLE_OK },
{ "", NULL, CURLE_BAD_FUNCTION_ARGUMENT },
{ "WTF", NULL, CURLE_BAD_FUNCTION_ARGUMENT },
@ -70,32 +87,8 @@ static struct test_spec test_specs[] = {
{ "190321134340-3", "1903-21-13 43:40:00 UTC-3", CURLE_OK },
{ "19032113434017.0-04", "1903-21-13 43:40:17 UTC-04", CURLE_OK },
{ "19032113434017.01-01:10", "1903-21-13 43:40:17.01 UTC-01:10", CURLE_OK },
};
};
static bool do_test(struct test_spec *spec, size_t i, struct dynbuf *dbuf)
{
CURLcode result;
const char *in = spec->input;
curlx_dyn_reset(dbuf);
result = Curl_x509_GTime2str(dbuf, in, in + strlen(in));
if(result != spec->exp_result) {
curl_mfprintf(stderr, "test %zu: expect result %d, got %d\n",
i, spec->exp_result, result);
return FALSE;
}
else if(!result && strcmp(spec->exp_output, curlx_dyn_ptr(dbuf))) {
curl_mfprintf(stderr,
"test %zu: input '%s', expected output '%s', got '%s'\n",
i, in, spec->exp_output, curlx_dyn_ptr(dbuf));
return FALSE;
}
return TRUE;
}
UNITTEST_START
{
size_t i;
struct dynbuf dbuf;
bool all_ok = TRUE;
@ -115,15 +108,17 @@ UNITTEST_START
curlx_dyn_free(&dbuf);
curl_global_cleanup();
UNITTEST_END_SIMPLE
}
UNITTEST_STOP
#else
UNITTEST_START
static CURLcode test_unit1656(char *arg)
{
puts("not tested since Curl_x509_GTime2str() is not built-in");
UNITTEST_BEGIN_SIMPLE
puts("not tested since Curl_x509_GTime2str() is not built in");
UNITTEST_END_SIMPLE
}
UNITTEST_STOP
#endif