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
147 lines
3.9 KiB
C
147 lines
3.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
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* Check for bugs #1303 and #1327: libcurl should never remove DNS entries
|
|
* created via CURLOPT_RESOLVE, neither after DNS_CACHE_TIMEOUT elapses
|
|
* (test1515) nor a dead connection is detected (test1616).
|
|
*/
|
|
|
|
#include "test.h"
|
|
#include "testtrace.h"
|
|
#include "testutil.h"
|
|
#include "warnless.h"
|
|
#include "memdebug.h"
|
|
|
|
#define DNS_TIMEOUT 1L
|
|
|
|
static CURLcode do_one_request(CURLM *m, char *URL, char *resolve)
|
|
{
|
|
CURL *curls;
|
|
struct curl_slist *resolve_list = NULL;
|
|
int still_running;
|
|
CURLcode res = CURLE_OK;
|
|
CURLMsg *msg;
|
|
int msgs_left;
|
|
|
|
resolve_list = curl_slist_append(resolve_list, resolve);
|
|
|
|
easy_init(curls);
|
|
|
|
easy_setopt(curls, CURLOPT_URL, URL);
|
|
easy_setopt(curls, CURLOPT_RESOLVE, resolve_list);
|
|
easy_setopt(curls, CURLOPT_DNS_CACHE_TIMEOUT, DNS_TIMEOUT);
|
|
|
|
libtest_debug_config.nohex = 1;
|
|
libtest_debug_config.tracetime = 1;
|
|
easy_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config);
|
|
easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
|
easy_setopt(curls, CURLOPT_VERBOSE, 1L);
|
|
|
|
multi_add_handle(m, curls);
|
|
multi_perform(m, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
while(still_running) {
|
|
struct timeval timeout;
|
|
fd_set fdread, fdwrite, fdexcep;
|
|
int maxfd = -99;
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
|
|
multi_fdset(m, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
select_test(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
|
|
|
|
abort_on_test_timeout();
|
|
multi_perform(m, &still_running);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
do {
|
|
msg = curl_multi_info_read(m, &msgs_left);
|
|
if(msg && msg->msg == CURLMSG_DONE && msg->easy_handle == curls) {
|
|
res = msg->data.result;
|
|
break;
|
|
}
|
|
} while(msg);
|
|
|
|
test_cleanup:
|
|
|
|
curl_multi_remove_handle(m, curls);
|
|
curl_easy_cleanup(curls);
|
|
curl_slist_free_all(resolve_list);
|
|
|
|
return res;
|
|
}
|
|
|
|
static CURLcode test_lib1515(char *URL)
|
|
{
|
|
CURLM *multi = NULL;
|
|
CURLcode res = CURLE_OK;
|
|
char *address = libtest_arg2;
|
|
char *port = libtest_arg3;
|
|
char *path = URL;
|
|
char dns_entry[256];
|
|
int i;
|
|
int count = 2;
|
|
|
|
curl_msnprintf(dns_entry, sizeof(dns_entry), "testserver.example.com:%s:%s",
|
|
port, address);
|
|
|
|
start_test_timing();
|
|
|
|
global_init(CURL_GLOBAL_ALL);
|
|
curl_global_trace("all");
|
|
multi_init(multi);
|
|
|
|
for(i = 1; i <= count; i++) {
|
|
char target_url[256];
|
|
curl_msnprintf(target_url, sizeof(target_url),
|
|
"http://testserver.example.com:%s/%s%04d", port, path, i);
|
|
|
|
/* second request must succeed like the first one */
|
|
res = do_one_request(multi, target_url, dns_entry);
|
|
if(res != CURLE_OK) {
|
|
curl_mfprintf(stderr, "request %s failed with %d\n", target_url, res);
|
|
goto test_cleanup;
|
|
}
|
|
|
|
if(i < count)
|
|
sleep(DNS_TIMEOUT + 1);
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|