mirror of
https://github.com/curl/curl.git
synced 2025-02-23 15:10:03 +08:00
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
232 lines
5.4 KiB
C
232 lines
5.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "test.h"
|
|
#include "first.h"
|
|
|
|
#ifdef HAVE_LOCALE_H
|
|
# include <locale.h> /* for setlocale() */
|
|
#endif
|
|
|
|
#ifdef HAVE_IO_H
|
|
# include <io.h> /* for setmode() */
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
# include <fcntl.h> /* for setmode() */
|
|
#endif
|
|
|
|
#ifdef CURLDEBUG
|
|
# define MEMDEBUG_NODEFINES
|
|
# include "memdebug.h"
|
|
#endif
|
|
|
|
#include "timediff.h"
|
|
|
|
int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
|
|
struct timeval *tv)
|
|
{
|
|
if(nfds < 0) {
|
|
SET_SOCKERRNO(EINVAL);
|
|
return -1;
|
|
}
|
|
#ifdef USE_WINSOCK
|
|
/*
|
|
* Winsock select() requires that at least one of the three fd_set
|
|
* pointers is not NULL and points to a non-empty fdset. IOW Winsock
|
|
* select() can not be used to sleep without a single fd_set.
|
|
*/
|
|
if(!nfds) {
|
|
Sleep((DWORD)curlx_tvtoms(tv));
|
|
return 0;
|
|
}
|
|
#endif
|
|
return select(nfds, rd, wr, exc, tv);
|
|
}
|
|
|
|
void wait_ms(int ms)
|
|
{
|
|
if(ms < 0)
|
|
return;
|
|
#ifdef USE_WINSOCK
|
|
Sleep((DWORD)ms);
|
|
#else
|
|
{
|
|
struct timeval t;
|
|
curlx_mstotv(&t, ms);
|
|
select_wrapper(0, NULL, NULL, NULL, &t);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
char *libtest_arg2 = NULL;
|
|
char *libtest_arg3 = NULL;
|
|
int test_argc;
|
|
char **test_argv;
|
|
|
|
struct timeval tv_test_start; /* for test timing */
|
|
|
|
int unitfail; /* for unittests */
|
|
|
|
#ifdef CURLDEBUG
|
|
static void memory_tracking_init(void)
|
|
{
|
|
char *env;
|
|
/* if CURL_MEMDEBUG is set, this starts memory tracking message logging */
|
|
env = curl_getenv("CURL_MEMDEBUG");
|
|
if(env) {
|
|
/* use the value as file name */
|
|
char fname[CURL_MT_LOGFNAME_BUFSIZE];
|
|
if(strlen(env) >= CURL_MT_LOGFNAME_BUFSIZE)
|
|
env[CURL_MT_LOGFNAME_BUFSIZE-1] = '\0';
|
|
strcpy(fname, env);
|
|
curl_free(env);
|
|
curl_dbg_memdebug(fname);
|
|
/* this weird stuff here is to make curl_free() get called before
|
|
curl_dbg_memdebug() as otherwise memory tracking will log a free()
|
|
without an alloc! */
|
|
}
|
|
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
|
|
env = curl_getenv("CURL_MEMLIMIT");
|
|
if(env) {
|
|
char *endptr;
|
|
long num = strtol(env, &endptr, 10);
|
|
if((endptr != env) && (endptr == env + strlen(env)) && (num > 0))
|
|
curl_dbg_memlimit(num);
|
|
curl_free(env);
|
|
}
|
|
}
|
|
#else
|
|
# define memory_tracking_init() Curl_nop_stmt
|
|
#endif
|
|
|
|
/* returns a hexdump in a static memory area */
|
|
char *hexdump(const unsigned char *buf, size_t len)
|
|
{
|
|
static char dump[200 * 3 + 1];
|
|
char *p = dump;
|
|
size_t i;
|
|
if(len > 200)
|
|
return NULL;
|
|
for(i = 0; i < len; i++, p += 3)
|
|
msnprintf(p, 4, "%02x ", buf[i]);
|
|
return dump;
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
char *URL;
|
|
CURLcode result;
|
|
int basearg;
|
|
test_func_t test_func;
|
|
|
|
#ifdef O_BINARY
|
|
# ifdef __HIGHC__
|
|
_setmode(stdout, O_BINARY);
|
|
# else
|
|
setmode(fileno(stdout), O_BINARY);
|
|
# endif
|
|
#endif
|
|
|
|
memory_tracking_init();
|
|
|
|
/*
|
|
* Setup proper locale from environment. This is needed to enable locale-
|
|
* specific behavior by the C library in order to test for undesired side
|
|
* effects that could cause in libcurl.
|
|
*/
|
|
#ifdef HAVE_SETLOCALE
|
|
setlocale(LC_ALL, "");
|
|
#endif
|
|
|
|
test_argc = argc;
|
|
test_argv = argv;
|
|
|
|
#ifdef CURLTESTS_BUNDLED
|
|
{
|
|
char *test_name;
|
|
|
|
--test_argc;
|
|
++test_argv;
|
|
|
|
basearg = 2;
|
|
|
|
if(argc < (basearg + 1)) {
|
|
fprintf(stderr, "Pass testname and URL as arguments please\n");
|
|
return 1;
|
|
}
|
|
|
|
test_name = argv[basearg - 1];
|
|
test_func = NULL;
|
|
{
|
|
size_t tmp;
|
|
for(tmp = 0; tmp < (sizeof(s_tests)/sizeof((s_tests)[0])); ++tmp) {
|
|
if(strcmp(test_name, s_tests[tmp].name) == 0) {
|
|
test_func = s_tests[tmp].ptr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(!test_func) {
|
|
fprintf(stderr, "Test '%s' not found.\n", test_name);
|
|
return 1;
|
|
}
|
|
|
|
fprintf(stderr, "Test: %s\n", test_name);
|
|
}
|
|
#else
|
|
basearg = 1;
|
|
|
|
if(argc < (basearg + 1)) {
|
|
fprintf(stderr, "Pass URL as argument please\n");
|
|
return 1;
|
|
}
|
|
|
|
test_func = test;
|
|
#endif
|
|
|
|
if(argc > (basearg + 1))
|
|
libtest_arg2 = argv[basearg + 1];
|
|
|
|
if(argc > (basearg + 2))
|
|
libtest_arg3 = argv[basearg + 2];
|
|
|
|
URL = argv[basearg]; /* provide this to the rest */
|
|
|
|
fprintf(stderr, "URL: %s\n", URL);
|
|
|
|
result = test_func(URL);
|
|
fprintf(stderr, "Test ended with result %d\n", result);
|
|
|
|
#ifdef _WIN32
|
|
/* flush buffers of all streams regardless of mode */
|
|
_flushall();
|
|
#endif
|
|
|
|
/* Regular program status codes are limited to 0..127 and 126 and 127 have
|
|
* special meanings by the shell, so limit a normal return code to 125 */
|
|
return (int)result <= 125 ? (int)result : 125;
|
|
}
|