romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 11:43:38 +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

95
tests/unit/unit3200.c
View file

@ -25,67 +25,59 @@
#include "curl_get_line.h"
#include "memdebug.h"
static CURLcode test_unit3200(char *arg)
{
UNITTEST_BEGIN_SIMPLE
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
!defined(CURL_DISABLE_HSTS) || !defined(CURL_DISABLE_NETRC)
/* The test XML does not supply a way to write files without newlines
* so we write our own
*/
#define C64 "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
#define C256 C64 C64 C64 C64
#define C1024 C256 C256 C256 C256
#define C4096 C1024 C1024 C1024 C1024
static CURLcode unit_setup(void)
{
return CURLE_OK;
}
static void unit_stop(void)
{
}
#if defined(CURL_GNUC_DIAG) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverlength-strings"
#endif
#define NUMTESTS 6
static const char *filecontents[] = {
/* Both should be read */
"LINE1\n"
"LINE2 NEWLINE\n",
/* The test XML does not supply a way to write files without newlines
* so we write our own
*/
/* Both should be read */
"LINE1\n"
"LINE2 NONEWLINE",
#define C64 "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
#define C256 C64 C64 C64 C64
#define C1024 C256 C256 C256 C256
#define C4096 C1024 C1024 C1024 C1024
/* Only first should be read */
"LINE1\n"
C4096,
static const char *filecontents[] = {
/* Both should be read */
"LINE1\n"
"LINE2 NEWLINE\n",
/* First line should be read */
"LINE1\n"
C4096 "SOME EXTRA TEXT",
/* Both should be read */
"LINE1\n"
"LINE2 NONEWLINE",
/* Only first should be read */
"LINE1\n"
C4096 "SOME EXTRA TEXT\n"
"LINE3\n",
/* Only first should be read */
"LINE1\n"
C4096,
"LINE1\x1aTEST"
};
/* First line should be read */
"LINE1\n"
C4096 "SOME EXTRA TEXT",
/* Only first should be read */
"LINE1\n"
C4096 "SOME EXTRA TEXT\n"
"LINE3\n",
"LINE1\x1aTEST"
};
#if defined(CURL_GNUC_DIAG) || defined(__clang__)
#pragma GCC diagnostic warning "-Woverlength-strings"
#pragma GCC diagnostic pop
#endif
UNITTEST_START
size_t i;
int rc = 0;
for(i = 0; i < NUMTESTS; i++) {
for(i = 0; i < CURL_ARRAYSIZE(filecontents); i++) {
FILE *fp;
struct dynbuf buf;
size_t len = 4096;
@ -170,21 +162,8 @@ UNITTEST_START
curl_mfprintf(stderr, "OK\n");
}
return (CURLcode)rc;
UNITTEST_STOP
#if defined(CURL_GNUC_DIAG) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
#else
static CURLcode unit_setup(void)
{
return CURLE_OK;
}
static void unit_stop(void)
{
}
UNITTEST_START
UNITTEST_STOP
#endif
UNITTEST_END_SIMPLE
}