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
211 lines
4.8 KiB
C
211 lines
4.8 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 "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
#ifdef HAVE_PTHREAD_H
|
|
#include <pthread.h>
|
|
#include <unistd.h>
|
|
|
|
#define TEST_HANG_TIMEOUT 60 * 1000
|
|
#define CONN_NUM 3
|
|
#define TIME_BETWEEN_START_SECS 2
|
|
|
|
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
|
|
static CURL *pending_handles[CONN_NUM];
|
|
static int pending_num = 0;
|
|
static CURLcode test_failure = CURLE_OK;
|
|
|
|
static CURLM *testmulti = NULL;
|
|
static const char *url;
|
|
|
|
static void *run_thread(void *ptr)
|
|
{
|
|
CURL *easy = NULL;
|
|
CURLcode res = CURLE_OK;
|
|
int i;
|
|
|
|
(void)ptr;
|
|
|
|
for(i = 0; i < CONN_NUM; i++) {
|
|
wait_ms(TIME_BETWEEN_START_SECS * 1000);
|
|
|
|
easy_init(easy);
|
|
|
|
easy_setopt(easy, CURLOPT_URL, url);
|
|
easy_setopt(easy, CURLOPT_VERBOSE, 0L);
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
if(test_failure) {
|
|
pthread_mutex_unlock(&lock);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
pending_handles[pending_num] = easy;
|
|
pending_num++;
|
|
easy = NULL;
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
res_multi_wakeup(testmulti);
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
curl_easy_cleanup(easy);
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
if(!test_failure)
|
|
test_failure = res;
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
CURLcode test(char *URL)
|
|
{
|
|
int still_running;
|
|
int num;
|
|
int i;
|
|
int result;
|
|
CURLcode res = CURLE_OK;
|
|
CURL *started_handles[CONN_NUM];
|
|
int started_num = 0;
|
|
int finished_num = 0;
|
|
pthread_t tid;
|
|
bool tid_valid = false;
|
|
struct CURLMsg *message;
|
|
|
|
start_test_timing();
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
|
|
multi_init(testmulti);
|
|
|
|
url = URL;
|
|
|
|
result = pthread_create(&tid, NULL, run_thread, NULL);
|
|
if(!result)
|
|
tid_valid = true;
|
|
else {
|
|
fprintf(stderr, "%s:%d Couldn't create thread, errno %d\n",
|
|
__FILE__, __LINE__, result);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
while(1) {
|
|
multi_perform(testmulti, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
while((message = curl_multi_info_read(testmulti, &num))) {
|
|
if(message->msg == CURLMSG_DONE) {
|
|
res = message->data.result;
|
|
if(res)
|
|
goto test_cleanup;
|
|
multi_remove_handle(testmulti, message->easy_handle);
|
|
finished_num++;
|
|
}
|
|
else {
|
|
fprintf(stderr, "%s:%d Got an unexpected message from curl: %i\n",
|
|
__FILE__, __LINE__, (int)message->msg);
|
|
res = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
if(CONN_NUM == finished_num)
|
|
break;
|
|
|
|
multi_poll(testmulti, NULL, 0, TEST_HANG_TIMEOUT, &num);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
pthread_mutex_lock(&lock);
|
|
|
|
while(pending_num > 0) {
|
|
res_multi_add_handle(testmulti, pending_handles[pending_num - 1]);
|
|
if(res) {
|
|
pthread_mutex_unlock(&lock);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
started_handles[started_num] = pending_handles[pending_num - 1];
|
|
started_num++;
|
|
pending_num--;
|
|
}
|
|
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
if(CONN_NUM != started_num) {
|
|
fprintf(stderr, "%s:%d Not all connections started: %d of %d\n",
|
|
__FILE__, __LINE__, started_num, CONN_NUM);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
if(CONN_NUM != finished_num) {
|
|
fprintf(stderr, "%s:%d Not all connections finished: %d of %d\n",
|
|
__FILE__, __LINE__, started_num, CONN_NUM);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
pthread_mutex_lock(&lock);
|
|
if(!test_failure)
|
|
test_failure = res;
|
|
pthread_mutex_unlock(&lock);
|
|
|
|
if(tid_valid)
|
|
pthread_join(tid, NULL);
|
|
|
|
curl_multi_cleanup(testmulti);
|
|
for(i = 0; i < pending_num; i++)
|
|
curl_easy_cleanup(pending_handles[i]);
|
|
for(i = 0; i < started_num; i++)
|
|
curl_easy_cleanup(started_handles[i]);
|
|
curl_global_cleanup();
|
|
|
|
return test_failure;
|
|
}
|
|
|
|
#else /* without pthread, this test doesn't work */
|
|
CURLcode test(char *URL)
|
|
{
|
|
(void)URL;
|
|
return 0;
|
|
}
|
|
#endif
|