mirror of
https://github.com/curl/curl.git
synced 2026-04-17 19:21:41 +03:00
2c27a67daa
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
115 lines
4.1 KiB
C
115 lines
4.1 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 "curlcheck.h"
|
|
|
|
#include "urldata.h"
|
|
#include "progress.h"
|
|
|
|
/*
|
|
* Invoke Curl_pgrsTime for TIMER_STARTSINGLE to trigger the behavior that
|
|
* manages is_t_startransfer_set, but fake the t_startsingle time for purposes
|
|
* of the test.
|
|
*/
|
|
static void fake_t_startsingle_time(struct Curl_easy *data,
|
|
struct curltime fake_now,
|
|
int seconds_offset)
|
|
{
|
|
Curl_pgrsTime(data, TIMER_STARTSINGLE);
|
|
data->progress.t_startsingle.tv_sec = fake_now.tv_sec + seconds_offset;
|
|
data->progress.t_startsingle.tv_usec = fake_now.tv_usec;
|
|
}
|
|
|
|
static bool usec_matches_seconds(timediff_t time_usec, int expected_seconds)
|
|
{
|
|
static int usec_magnitude = 1000000;
|
|
|
|
int time_sec = (int)(time_usec / usec_magnitude);
|
|
bool same = (time_sec == expected_seconds);
|
|
curl_mfprintf(stderr, "is %d us same as %d seconds? %s\n",
|
|
(int)time_usec, expected_seconds,
|
|
same ? "Yes" : "No");
|
|
return same;
|
|
}
|
|
|
|
static void expect_timer_seconds(struct Curl_easy *data, int seconds)
|
|
{
|
|
char msg[64];
|
|
curl_msnprintf(msg, sizeof(msg), "about %d seconds should have passed",
|
|
seconds);
|
|
fail_unless(usec_matches_seconds(data->progress.t_nslookup, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_connect, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_appconnect, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_pretransfer, seconds),
|
|
msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_starttransfer, seconds),
|
|
msg);
|
|
}
|
|
|
|
/* Scenario: simulate a redirect. When a redirect occurs, t_nslookup,
|
|
* t_connect, t_appconnect, t_pretransfer, and t_starttransfer are additive.
|
|
* E.g., if t_starttransfer took 2 seconds initially and took another 1
|
|
* second for the redirect request, then the resulting t_starttransfer should
|
|
* be 3 seconds. */
|
|
static CURLcode test_unit1399(char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
struct Curl_easy data;
|
|
struct curltime now = curlx_now();
|
|
|
|
data.progress.t_nslookup = 0;
|
|
data.progress.t_connect = 0;
|
|
data.progress.t_appconnect = 0;
|
|
data.progress.t_pretransfer = 0;
|
|
data.progress.t_starttransfer = 0;
|
|
data.progress.t_redirect = 0;
|
|
data.progress.start.tv_sec = now.tv_sec - 2;
|
|
data.progress.start.tv_usec = now.tv_usec;
|
|
fake_t_startsingle_time(&data, now, -2);
|
|
|
|
Curl_pgrsTime(&data, TIMER_NAMELOOKUP);
|
|
Curl_pgrsTime(&data, TIMER_CONNECT);
|
|
Curl_pgrsTime(&data, TIMER_APPCONNECT);
|
|
Curl_pgrsTime(&data, TIMER_PRETRANSFER);
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
|
|
expect_timer_seconds(&data, 2);
|
|
|
|
/* now simulate the redirect */
|
|
data.progress.t_redirect = data.progress.t_starttransfer + 1;
|
|
fake_t_startsingle_time(&data, now, -1);
|
|
|
|
Curl_pgrsTime(&data, TIMER_NAMELOOKUP);
|
|
Curl_pgrsTime(&data, TIMER_CONNECT);
|
|
Curl_pgrsTime(&data, TIMER_APPCONNECT);
|
|
Curl_pgrsTime(&data, TIMER_PRETRANSFER);
|
|
/* ensure t_starttransfer is only set on the first invocation by attempting
|
|
* to set it twice */
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
|
|
expect_timer_seconds(&data, 3);
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|