mirror of
https://github.com/curl/curl.git
synced 2026-04-19 07:51:16 +03: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
136 lines
3.6 KiB
C
136 lines
3.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 "curlcheck.h"
|
|
|
|
#include "splay.h"
|
|
#include "warnless.h"
|
|
|
|
static void splayprint(struct Curl_tree *t, int d, char output)
|
|
{
|
|
struct Curl_tree *node;
|
|
int i;
|
|
int count;
|
|
if(!t)
|
|
return;
|
|
|
|
splayprint(t->larger, d + 1, output);
|
|
for(i = 0; i < d; i++)
|
|
if(output)
|
|
printf(" ");
|
|
|
|
if(output) {
|
|
printf("%ld.%ld[%d]", (long)t->key.tv_sec,
|
|
(long)t->key.tv_usec, i);
|
|
}
|
|
|
|
for(count = 0, node = t->samen; node != t; node = node->samen, count++)
|
|
;
|
|
|
|
if(output) {
|
|
if(count)
|
|
printf(" [%d more]\n", count);
|
|
else
|
|
printf("\n");
|
|
}
|
|
|
|
splayprint(t->smaller, d + 1, output);
|
|
}
|
|
|
|
static CURLcode test_unit1309(char *arg)
|
|
{
|
|
UNITTEST_BEGIN_SIMPLE
|
|
|
|
/* number of nodes to add to the splay tree */
|
|
#define NUM_NODES 50
|
|
|
|
struct Curl_tree *root, *removed;
|
|
struct Curl_tree nodes[NUM_NODES*3];
|
|
size_t storage[NUM_NODES*3];
|
|
int rc;
|
|
int i, j;
|
|
struct curltime tv_now = {0, 0};
|
|
root = NULL; /* the empty tree */
|
|
|
|
/* add nodes */
|
|
for(i = 0; i < NUM_NODES; i++) {
|
|
struct curltime key;
|
|
|
|
key.tv_sec = 0;
|
|
key.tv_usec = (541*i)%1023;
|
|
storage[i] = key.tv_usec;
|
|
Curl_splayset(&nodes[i], &storage[i]);
|
|
root = Curl_splayinsert(key, root, &nodes[i]);
|
|
}
|
|
|
|
puts("Result:");
|
|
splayprint(root, 0, 1);
|
|
|
|
for(i = 0; i < NUM_NODES; i++) {
|
|
int rem = (i + 7)%NUM_NODES;
|
|
printf("Tree look:\n");
|
|
splayprint(root, 0, 1);
|
|
curl_mprintf("remove pointer %d, payload %zu\n", rem,
|
|
*(size_t *)Curl_splayget(&nodes[rem]));
|
|
rc = Curl_splayremove(root, &nodes[rem], &root);
|
|
if(rc) {
|
|
/* failed! */
|
|
printf("remove %d failed!\n", rem);
|
|
fail("remove");
|
|
}
|
|
}
|
|
|
|
fail_unless(root == NULL, "tree not empty after removing all nodes");
|
|
|
|
/* rebuild tree */
|
|
for(i = 0; i < NUM_NODES; i++) {
|
|
struct curltime key;
|
|
|
|
key.tv_sec = 0;
|
|
key.tv_usec = (541*i)%1023;
|
|
|
|
/* add some nodes with the same key */
|
|
for(j = 0; j <= i % 3; j++) {
|
|
storage[i * 3 + j] = key.tv_usec*10 + j;
|
|
Curl_splayset(&nodes[i * 3 + j], &storage[i * 3 + j]);
|
|
root = Curl_splayinsert(key, root, &nodes[i * 3 + j]);
|
|
}
|
|
}
|
|
|
|
removed = NULL;
|
|
for(i = 0; i <= 1100; i += 100) {
|
|
printf("Removing nodes not larger than %d\n", i);
|
|
tv_now.tv_usec = i;
|
|
root = Curl_splaygetbest(tv_now, root, &removed);
|
|
while(removed) {
|
|
curl_mprintf("removed payload %zu[%zu]\n",
|
|
*(size_t *)Curl_splayget(removed) / 10,
|
|
*(size_t *)Curl_splayget(removed) % 10);
|
|
root = Curl_splaygetbest(tv_now, root, &removed);
|
|
}
|
|
}
|
|
|
|
fail_unless(root == NULL, "tree not empty when it should be");
|
|
|
|
UNITTEST_END_SIMPLE
|
|
}
|