mirror of
https://github.com/curl/curl.git
synced 2025-03-07 15:27:17 +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
242 lines
7.0 KiB
C
242 lines
7.0 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 <limits.h>
|
|
#include <assert.h>
|
|
|
|
#include "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
#define TEST_HANG_TIMEOUT 60 * 1000
|
|
#define MAX_EASY_HANDLES 3
|
|
|
|
static int ntlm_counter[MAX_EASY_HANDLES];
|
|
static CURL *ntlm_easy[MAX_EASY_HANDLES];
|
|
static curl_socket_t ntlm_sockets[MAX_EASY_HANDLES];
|
|
static CURLcode ntlmcb_res = CURLE_OK;
|
|
|
|
static size_t callback(char *ptr, size_t size, size_t nmemb, void *data)
|
|
{
|
|
ssize_t idx = ((CURL **) data) - ntlm_easy;
|
|
curl_socket_t sock;
|
|
long longdata;
|
|
CURLcode code;
|
|
const size_t failure = (size && nmemb) ? 0 : 1;
|
|
(void)ptr;
|
|
|
|
ntlm_counter[idx] += (int)(size * nmemb);
|
|
|
|
/* Get socket being used for this easy handle, otherwise CURL_SOCKET_BAD */
|
|
CURL_IGNORE_DEPRECATION(
|
|
code = curl_easy_getinfo(ntlm_easy[idx], CURLINFO_LASTSOCKET, &longdata);
|
|
)
|
|
if(CURLE_OK != code) {
|
|
fprintf(stderr, "%s:%d curl_easy_getinfo() failed, "
|
|
"with code %d (%s)\n",
|
|
__FILE__, __LINE__, (int)code, curl_easy_strerror(code));
|
|
ntlmcb_res = TEST_ERR_MAJOR_BAD;
|
|
return failure;
|
|
}
|
|
if(longdata == -1L)
|
|
sock = CURL_SOCKET_BAD;
|
|
else
|
|
sock = (curl_socket_t)longdata;
|
|
|
|
if(sock != CURL_SOCKET_BAD) {
|
|
/* Track relationship between this easy handle and the socket. */
|
|
if(ntlm_sockets[idx] == CURL_SOCKET_BAD) {
|
|
/* An easy handle without previous socket, record the socket. */
|
|
ntlm_sockets[idx] = sock;
|
|
}
|
|
else if(sock != ntlm_sockets[idx]) {
|
|
/* An easy handle with a socket different to previously
|
|
tracked one, log and fail right away. Known bug #37. */
|
|
fprintf(stderr, "Handle %d started on socket %d and moved to %d\n",
|
|
curlx_sztosi(idx), (int)ntlm_sockets[idx], (int)sock);
|
|
ntlmcb_res = TEST_ERR_MAJOR_BAD;
|
|
return failure;
|
|
}
|
|
}
|
|
return size * nmemb;
|
|
}
|
|
|
|
enum HandleState {
|
|
ReadyForNewHandle,
|
|
NeedSocketForNewHandle,
|
|
NoMoreHandles
|
|
};
|
|
|
|
CURLcode test(char *url)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
CURLM *multi = NULL;
|
|
int running;
|
|
int i;
|
|
int num_handles = 0;
|
|
enum HandleState state = ReadyForNewHandle;
|
|
size_t urllen = strlen(url) + 4 + 1;
|
|
char *full_url = malloc(urllen);
|
|
|
|
start_test_timing();
|
|
|
|
if(!full_url) {
|
|
fprintf(stderr, "Not enough memory for full url\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
for(i = 0; i < MAX_EASY_HANDLES; ++i) {
|
|
ntlm_easy[i] = NULL;
|
|
ntlm_sockets[i] = CURL_SOCKET_BAD;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(res) {
|
|
free(full_url);
|
|
return res;
|
|
}
|
|
|
|
multi_init(multi);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
long timeout = -99;
|
|
int maxfd = -99;
|
|
bool found_new_socket = FALSE;
|
|
|
|
/* Start a new handle if we aren't at the max */
|
|
if(state == ReadyForNewHandle) {
|
|
easy_init(ntlm_easy[num_handles]);
|
|
|
|
if(num_handles % 3 == 2) {
|
|
msnprintf(full_url, urllen, "%s0200", url);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_HTTPAUTH, CURLAUTH_NTLM);
|
|
}
|
|
else {
|
|
msnprintf(full_url, urllen, "%s0100", url);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
|
|
}
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_FRESH_CONNECT, 1L);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_URL, full_url);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_VERBOSE, 1L);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_HTTPGET, 1L);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_USERPWD,
|
|
"testuser:testpass");
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_WRITEFUNCTION, callback);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_WRITEDATA,
|
|
ntlm_easy + num_handles);
|
|
easy_setopt(ntlm_easy[num_handles], CURLOPT_HEADER, 1L);
|
|
|
|
multi_add_handle(multi, ntlm_easy[num_handles]);
|
|
num_handles += 1;
|
|
state = NeedSocketForNewHandle;
|
|
res = ntlmcb_res;
|
|
}
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
fprintf(stderr, "%s:%d running %d state %d\n",
|
|
__FILE__, __LINE__, running, state);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running && state == NoMoreHandles)
|
|
break; /* done */
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
|
|
multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
if(state == NeedSocketForNewHandle) {
|
|
if(maxfd != -1 && !found_new_socket) {
|
|
fprintf(stderr, "Warning: socket did not open immediately for new "
|
|
"handle (trying again)\n");
|
|
continue;
|
|
}
|
|
state = num_handles < MAX_EASY_HANDLES ? ReadyForNewHandle
|
|
: NoMoreHandles;
|
|
fprintf(stderr, "%s:%d new state %d\n",
|
|
__FILE__, __LINE__, state);
|
|
}
|
|
|
|
multi_timeout(multi, &timeout);
|
|
|
|
/* At this point, timeout is guaranteed to be greater or equal than -1. */
|
|
|
|
fprintf(stderr, "%s:%d num_handles %d timeout %ld running %d\n",
|
|
__FILE__, __LINE__, num_handles, timeout, running);
|
|
|
|
if(timeout != -1L) {
|
|
int itimeout;
|
|
#if LONG_MAX > INT_MAX
|
|
itimeout = (timeout > (long)INT_MAX) ? INT_MAX : (int)timeout;
|
|
#else
|
|
itimeout = (int)timeout;
|
|
#endif
|
|
interval.tv_sec = itimeout/1000;
|
|
interval.tv_usec = (itimeout%1000)*1000;
|
|
}
|
|
else {
|
|
interval.tv_sec = 0;
|
|
interval.tv_usec = 5000;
|
|
|
|
/* if there's no timeout and we get here on the last handle, we may
|
|
already have read the last part of the stream so waiting makes no
|
|
sense */
|
|
if(!running && num_handles == MAX_EASY_HANDLES) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
select_test(maxfd + 1, &fdread, &fdwrite, &fdexcep, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* proper cleanup sequence - type PB */
|
|
|
|
for(i = 0; i < MAX_EASY_HANDLES; i++) {
|
|
printf("Data connection %d: %d\n", i, ntlm_counter[i]);
|
|
curl_multi_remove_handle(multi, ntlm_easy[i]);
|
|
curl_easy_cleanup(ntlm_easy[i]);
|
|
}
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
free(full_url);
|
|
|
|
return res;
|
|
}
|