mirror of
https://github.com/curl/curl.git
synced 2026-04-14 00:51:42 +08:00
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
101 lines
2.6 KiB
C
101 lines
2.6 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 "timediff.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
static CURLcode test_lib1905(char *URL)
|
|
{
|
|
CURLSH *sh = NULL;
|
|
CURL *ch = NULL;
|
|
int unfinished;
|
|
CURLM *cm;
|
|
|
|
curl_global_init(CURL_GLOBAL_ALL);
|
|
|
|
cm = curl_multi_init();
|
|
if(!cm) {
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MULTI;
|
|
}
|
|
sh = curl_share_init();
|
|
if(!sh)
|
|
goto cleanup;
|
|
|
|
curl_share_setopt(sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
|
|
curl_share_setopt(sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
|
|
|
|
ch = curl_easy_init();
|
|
if(!ch)
|
|
goto cleanup;
|
|
|
|
curl_easy_setopt(ch, CURLOPT_SHARE, sh);
|
|
curl_easy_setopt(ch, CURLOPT_URL, URL);
|
|
curl_easy_setopt(ch, CURLOPT_COOKIEFILE, libtest_arg2);
|
|
curl_easy_setopt(ch, CURLOPT_COOKIEJAR, libtest_arg2);
|
|
|
|
curl_multi_add_handle(cm, ch);
|
|
|
|
unfinished = 1;
|
|
while(unfinished) {
|
|
int MAX = 0;
|
|
long max_tout;
|
|
fd_set R, W, E;
|
|
struct timeval timeout;
|
|
|
|
FD_ZERO(&R);
|
|
FD_ZERO(&W);
|
|
FD_ZERO(&E);
|
|
curl_multi_perform(cm, &unfinished);
|
|
|
|
curl_multi_fdset(cm, &R, &W, &E, &MAX);
|
|
curl_multi_timeout(cm, &max_tout);
|
|
|
|
if(max_tout > 0) {
|
|
curlx_mstotv(&timeout, max_tout);
|
|
}
|
|
else {
|
|
timeout.tv_sec = 0;
|
|
timeout.tv_usec = 1000;
|
|
}
|
|
|
|
select(MAX + 1, &R, &W, &E, &timeout);
|
|
}
|
|
|
|
curl_easy_setopt(ch, CURLOPT_COOKIELIST, "FLUSH");
|
|
curl_easy_setopt(ch, CURLOPT_SHARE, NULL);
|
|
|
|
curl_multi_remove_handle(cm, ch);
|
|
cleanup:
|
|
curl_easy_cleanup(ch);
|
|
curl_share_cleanup(sh);
|
|
curl_multi_cleanup(cm);
|
|
curl_global_cleanup();
|
|
|
|
return CURLE_OK;
|
|
}
|