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
270 lines
6.9 KiB
C
270 lines
6.9 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 "memdebug.h"
|
|
|
|
static char testdata[]=
|
|
"dummy\n";
|
|
|
|
struct WriteThis {
|
|
char *readptr;
|
|
curl_off_t sizeleft;
|
|
};
|
|
|
|
static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
|
|
{
|
|
struct WriteThis *pooh = (struct WriteThis *)userp;
|
|
int eof = !*pooh->readptr;
|
|
|
|
if(size*nmemb < 1)
|
|
return 0;
|
|
|
|
#ifndef LIB645
|
|
eof = pooh->sizeleft <= 0;
|
|
if(!eof)
|
|
pooh->sizeleft--;
|
|
#endif
|
|
|
|
if(!eof) {
|
|
*ptr = *pooh->readptr; /* copy one single byte */
|
|
pooh->readptr++; /* advance pointer */
|
|
return 1; /* we return 1 byte at a time! */
|
|
}
|
|
|
|
return 0; /* no more data left to deliver */
|
|
}
|
|
|
|
static CURLcode test_once(char *URL, bool oldstyle)
|
|
{
|
|
CURL *curl;
|
|
CURLcode res = CURLE_OK;
|
|
|
|
curl_mime *mime = NULL;
|
|
curl_mimepart *part = NULL;
|
|
struct WriteThis pooh;
|
|
struct WriteThis pooh2;
|
|
curl_off_t datasize = -1;
|
|
|
|
pooh.readptr = testdata;
|
|
#ifndef LIB645
|
|
datasize = (curl_off_t)strlen(testdata);
|
|
#endif
|
|
pooh.sizeleft = datasize;
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
fprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
mime = curl_mime_init(curl);
|
|
if(!mime) {
|
|
fprintf(stderr, "curl_mime_init() failed\n");
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
part = curl_mime_addpart(mime);
|
|
if(!part) {
|
|
fprintf(stderr, "curl_mime_addpart(1) failed\n");
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* Fill in the file upload part */
|
|
if(oldstyle) {
|
|
res = curl_mime_name(part, "sendfile");
|
|
if(!res)
|
|
res = curl_mime_data_cb(part, datasize, read_callback,
|
|
NULL, NULL, &pooh);
|
|
if(!res)
|
|
res = curl_mime_filename(part, "postit2.c");
|
|
}
|
|
else {
|
|
/* new style */
|
|
res = curl_mime_name(part, "sendfile alternative");
|
|
if(!res)
|
|
res = curl_mime_data_cb(part, datasize, read_callback,
|
|
NULL, NULL, &pooh);
|
|
if(!res)
|
|
res = curl_mime_filename(part, "file name 2");
|
|
}
|
|
|
|
if(res)
|
|
printf("curl_mime_xxx(1) = %s\n", curl_easy_strerror(res));
|
|
|
|
/* Now add the same data with another name and make it not look like
|
|
a file upload but still using the callback */
|
|
|
|
pooh2.readptr = testdata;
|
|
#ifndef LIB645
|
|
datasize = (curl_off_t)strlen(testdata);
|
|
#endif
|
|
pooh2.sizeleft = datasize;
|
|
|
|
part = curl_mime_addpart(mime);
|
|
if(!part) {
|
|
fprintf(stderr, "curl_mime_addpart(2) failed\n");
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
/* Fill in the file upload part */
|
|
res = curl_mime_name(part, "callbackdata");
|
|
if(!res)
|
|
res = curl_mime_data_cb(part, datasize, read_callback,
|
|
NULL, NULL, &pooh2);
|
|
|
|
if(res)
|
|
printf("curl_mime_xxx(2) = %s\n", curl_easy_strerror(res));
|
|
|
|
part = curl_mime_addpart(mime);
|
|
if(!part) {
|
|
fprintf(stderr, "curl_mime_addpart(3) failed\n");
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* Fill in the filename field */
|
|
res = curl_mime_name(part, "filename");
|
|
if(!res)
|
|
res = curl_mime_data(part, "postit2.c",
|
|
CURL_ZERO_TERMINATED);
|
|
|
|
if(res)
|
|
printf("curl_mime_xxx(3) = %s\n", curl_easy_strerror(res));
|
|
|
|
/* Fill in a submit field too */
|
|
part = curl_mime_addpart(mime);
|
|
if(!part) {
|
|
fprintf(stderr, "curl_mime_addpart(4) failed\n");
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
res = curl_mime_name(part, "submit");
|
|
if(!res)
|
|
res = curl_mime_data(part, "send",
|
|
CURL_ZERO_TERMINATED);
|
|
|
|
if(res)
|
|
printf("curl_mime_xxx(4) = %s\n", curl_easy_strerror(res));
|
|
|
|
part = curl_mime_addpart(mime);
|
|
if(!part) {
|
|
fprintf(stderr, "curl_mime_addpart(5) failed\n");
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
res = curl_mime_name(part, "somename");
|
|
if(!res)
|
|
res = curl_mime_filename(part, "somefile.txt");
|
|
if(!res)
|
|
res = curl_mime_data(part, "blah blah", 9);
|
|
|
|
if(res)
|
|
printf("curl_mime_xxx(5) = %s\n", curl_easy_strerror(res));
|
|
|
|
/* First set the URL that is about to receive our POST. */
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
/* send a multi-part mimepost */
|
|
test_setopt(curl, CURLOPT_MIMEPOST, mime);
|
|
|
|
/* get verbose debug output please */
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* include headers in the output */
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
|
|
/* Perform the request, res will get the return code */
|
|
res = curl_easy_perform(curl);
|
|
|
|
test_cleanup:
|
|
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
|
|
/* now cleanup the mimepost structure */
|
|
curl_mime_free(mime);
|
|
|
|
return res;
|
|
}
|
|
|
|
static CURLcode cyclic_add(void)
|
|
{
|
|
CURL *easy = curl_easy_init();
|
|
curl_mime *mime = curl_mime_init(easy);
|
|
curl_mimepart *part = curl_mime_addpart(mime);
|
|
CURLcode a1 = curl_mime_subparts(part, mime);
|
|
|
|
if(a1 == CURLE_BAD_FUNCTION_ARGUMENT) {
|
|
curl_mime *submime = curl_mime_init(easy);
|
|
curl_mimepart *subpart = curl_mime_addpart(submime);
|
|
|
|
curl_mime_subparts(part, submime);
|
|
a1 = curl_mime_subparts(subpart, mime);
|
|
}
|
|
|
|
curl_mime_free(mime);
|
|
curl_easy_cleanup(easy);
|
|
if(a1 != CURLE_BAD_FUNCTION_ARGUMENT)
|
|
/* that should have failed */
|
|
return (CURLcode)1;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode test(char *URL)
|
|
{
|
|
CURLcode res;
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
fprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
res = test_once(URL, TRUE); /* old */
|
|
if(!res)
|
|
res = test_once(URL, FALSE); /* new */
|
|
|
|
if(!res)
|
|
res = cyclic_add();
|
|
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|