From 6a0cd4feb7c337f840493e2cab1a6ce5a89a9540 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jun 2025 01:10:59 +0200 Subject: [PATCH] tests: make individual test sources compile cleanly Tidy up headers and includes to ensure all individual test source compile cleanly (but not link). To allow running clang-tidy (and possibly other static analyzers) on them. It also improves readability and allows to verify them locally, without the bundle logic. clang-tidy ignores #included C files, so it's blind to bundle C files the include these tests. The current workaround of embedding has a couple of downsides:. meaningless filenames and line numbers, missing issues, messing up self header paths. Thus, running it on individual sources would be beneficial. Also: - de-duplicate includes. - untangle some includes. - formatting/indentation fixes. - merge `getpart.h` into `first.h`. Ref: https://github.com/curl/curl/pull/17680#issuecomment-2991730158 Closes #17703 --- scripts/mk-unity.pl | 2 +- tests/client/first.c | 3 +- tests/client/first.h | 2 + tests/client/h2_pausing.c | 2 + tests/client/h2_serverpush.c | 1 + tests/client/h2_upgrade_extreme.c | 1 + tests/client/hx_download.c | 1 + tests/client/hx_upload.c | 1 + tests/client/tls_session_reuse.c | 1 + tests/client/upload_pausing.c | 2 + tests/client/ws_data.c | 2 + tests/client/ws_pingpong.c | 2 + tests/libtest/first.c | 4 +- tests/libtest/first.h | 2 + tests/libtest/lib1156.c | 2 +- tests/libtest/lib1308.c | 2 +- tests/libtest/lib1485.c | 2 +- tests/libtest/lib1500.c | 2 +- tests/libtest/lib1501.c | 2 +- tests/libtest/lib1502.c | 2 +- tests/libtest/lib1506.c | 2 +- tests/libtest/lib1507.c | 2 +- tests/libtest/lib1508.c | 2 +- tests/libtest/lib1509.c | 2 +- tests/libtest/lib1510.c | 2 +- tests/libtest/lib1511.c | 2 +- tests/libtest/lib1512.c | 2 +- tests/libtest/lib1513.c | 2 +- tests/libtest/lib1514.c | 2 +- tests/libtest/lib1515.c | 2 +- tests/libtest/lib1517.c | 2 +- tests/libtest/lib1518.c | 2 +- tests/libtest/lib1520.c | 2 +- tests/libtest/lib1522.c | 2 +- tests/libtest/lib1523.c | 2 +- tests/libtest/lib1525.c | 2 +- tests/libtest/lib1526.c | 2 +- tests/libtest/lib1527.c | 2 +- tests/libtest/lib1528.c | 2 +- tests/libtest/lib1529.c | 2 +- tests/libtest/lib1530.c | 2 +- tests/libtest/lib1531.c | 2 +- tests/libtest/lib1532.c | 2 +- tests/libtest/lib1533.c | 2 +- tests/libtest/lib1534.c | 2 +- tests/libtest/lib1535.c | 2 +- tests/libtest/lib1536.c | 2 +- tests/libtest/lib1537.c | 2 +- tests/libtest/lib1538.c | 2 +- tests/libtest/lib1540.c | 2 +- tests/libtest/lib1541.c | 2 +- tests/libtest/lib1542.c | 2 +- tests/libtest/lib1545.c | 2 +- tests/libtest/lib1550.c | 2 +- tests/libtest/lib1551.c | 2 +- tests/libtest/lib1552.c | 2 +- tests/libtest/lib1553.c | 2 +- tests/libtest/lib1554.c | 2 +- tests/libtest/lib1555.c | 2 +- tests/libtest/lib1556.c | 2 +- tests/libtest/lib1557.c | 2 +- tests/libtest/lib1558.c | 2 +- tests/libtest/lib1559.c | 2 +- tests/libtest/lib1560.c | 2 +- tests/libtest/lib1564.c | 2 +- tests/libtest/lib1565.c | 2 +- tests/libtest/lib1567.c | 2 +- tests/libtest/lib1568.c | 2 +- tests/libtest/lib1569.c | 2 +- tests/libtest/lib1571.c | 2 +- tests/libtest/lib1576.c | 2 +- tests/libtest/lib1591.c | 2 +- tests/libtest/lib1592.c | 2 +- tests/libtest/lib1593.c | 2 +- tests/libtest/lib1594.c | 2 +- tests/libtest/lib1597.c | 2 +- tests/libtest/lib1598.c | 2 +- tests/libtest/lib1599.c | 2 +- tests/libtest/lib1662.c | 2 +- tests/libtest/lib1900.c | 2 +- tests/libtest/lib1901.c | 2 +- tests/libtest/lib1903.c | 2 +- tests/libtest/lib1905.c | 2 +- tests/libtest/lib1906.c | 2 +- tests/libtest/lib1907.c | 2 +- tests/libtest/lib1908.c | 2 +- tests/libtest/lib1910.c | 2 +- tests/libtest/lib1911.c | 2 +- tests/libtest/lib1912.c | 2 +- tests/libtest/lib1913.c | 2 +- tests/libtest/lib1915.c | 2 +- tests/libtest/lib1916.c | 2 +- tests/libtest/lib1918.c | 2 +- tests/libtest/lib1919.c | 2 +- tests/libtest/lib1933.c | 2 +- tests/libtest/lib1934.c | 2 +- tests/libtest/lib1935.c | 2 +- tests/libtest/lib1936.c | 2 +- tests/libtest/lib1937.c | 2 +- tests/libtest/lib1938.c | 2 +- tests/libtest/lib1939.c | 2 +- tests/libtest/lib1940.c | 2 +- tests/libtest/lib1945.c | 2 +- tests/libtest/lib1947.c | 2 +- tests/libtest/lib1948.c | 2 +- tests/libtest/lib1955.c | 2 +- tests/libtest/lib1956.c | 2 +- tests/libtest/lib1957.c | 2 +- tests/libtest/lib1958.c | 2 +- tests/libtest/lib1959.c | 2 +- tests/libtest/lib1960.c | 2 +- tests/libtest/lib1964.c | 2 +- tests/libtest/lib1970.c | 2 +- tests/libtest/lib1971.c | 2 +- tests/libtest/lib1972.c | 2 +- tests/libtest/lib1973.c | 2 +- tests/libtest/lib1974.c | 2 +- tests/libtest/lib1975.c | 2 +- tests/libtest/lib1977.c | 2 +- tests/libtest/lib1978.c | 2 +- tests/libtest/lib2023.c | 2 +- tests/libtest/lib2032.c | 2 +- tests/libtest/lib2082.c | 2 +- tests/libtest/lib2301.c | 2 +- tests/libtest/lib2302.c | 2 +- tests/libtest/lib2304.c | 2 +- tests/libtest/lib2306.c | 2 +- tests/libtest/lib2308.c | 2 +- tests/libtest/lib2309.c | 2 +- tests/libtest/lib2402.c | 2 +- tests/libtest/lib2404.c | 2 +- tests/libtest/lib2405.c | 2 +- tests/libtest/lib2502.c | 2 +- tests/libtest/lib2700.c | 2 +- tests/libtest/lib3010.c | 2 +- tests/libtest/lib3025.c | 2 +- tests/libtest/lib3026.c | 2 +- tests/libtest/lib3027.c | 2 +- tests/libtest/lib3100.c | 2 +- tests/libtest/lib3101.c | 2 +- tests/libtest/lib3102.c | 2 +- tests/libtest/lib3103.c | 2 +- tests/libtest/lib3104.c | 2 +- tests/libtest/lib3105.c | 2 +- tests/libtest/lib3207.c | 2 +- tests/libtest/lib3208.c | 2 +- tests/libtest/lib500.c | 2 +- tests/libtest/lib501.c | 2 +- tests/libtest/lib502.c | 2 +- tests/libtest/lib503.c | 2 +- tests/libtest/lib504.c | 2 +- tests/libtest/lib505.c | 2 +- tests/libtest/lib506.c | 2 +- tests/libtest/lib507.c | 2 +- tests/libtest/lib508.c | 2 +- tests/libtest/lib509.c | 2 +- tests/libtest/lib510.c | 2 +- tests/libtest/lib511.c | 2 +- tests/libtest/lib512.c | 2 +- tests/libtest/lib513.c | 2 +- tests/libtest/lib514.c | 2 +- tests/libtest/lib515.c | 2 +- tests/libtest/lib516.c | 2 +- tests/libtest/lib517.c | 2 +- tests/libtest/lib518.c | 2 +- tests/libtest/lib519.c | 2 +- tests/libtest/lib520.c | 2 +- tests/libtest/lib521.c | 2 +- tests/libtest/lib523.c | 2 +- tests/libtest/lib524.c | 2 +- tests/libtest/lib525.c | 2 +- tests/libtest/lib526.c | 2 +- tests/libtest/lib530.c | 2 +- tests/libtest/lib533.c | 2 +- tests/libtest/lib536.c | 2 +- tests/libtest/lib537.c | 2 +- tests/libtest/lib539.c | 2 +- tests/libtest/lib540.c | 2 +- tests/libtest/lib541.c | 2 +- tests/libtest/lib542.c | 2 +- tests/libtest/lib543.c | 2 +- tests/libtest/lib544.c | 2 +- tests/libtest/lib547.c | 2 +- tests/libtest/lib549.c | 2 +- tests/libtest/lib552.c | 2 +- tests/libtest/lib553.c | 2 +- tests/libtest/lib554.c | 2 +- tests/libtest/lib555.c | 2 +- tests/libtest/lib556.c | 2 +- tests/libtest/lib557.c | 2 +- tests/libtest/lib558.c | 2 +- tests/libtest/lib559.c | 2 +- tests/libtest/lib560.c | 2 +- tests/libtest/lib562.c | 2 +- tests/libtest/lib564.c | 2 +- tests/libtest/lib566.c | 2 +- tests/libtest/lib567.c | 2 +- tests/libtest/lib568.c | 2 +- tests/libtest/lib569.c | 2 +- tests/libtest/lib570.c | 2 +- tests/libtest/lib571.c | 2 +- tests/libtest/lib572.c | 2 +- tests/libtest/lib573.c | 2 +- tests/libtest/lib574.c | 2 +- tests/libtest/lib575.c | 2 +- tests/libtest/lib576.c | 2 +- tests/libtest/lib578.c | 2 +- tests/libtest/lib579.c | 2 +- tests/libtest/lib582.c | 2 +- tests/libtest/lib583.c | 2 +- tests/libtest/lib586.c | 2 +- tests/libtest/lib589.c | 2 +- tests/libtest/lib590.c | 2 +- tests/libtest/lib591.c | 2 +- tests/libtest/lib597.c | 2 +- tests/libtest/lib598.c | 2 +- tests/libtest/lib599.c | 2 +- tests/libtest/lib643.c | 2 +- tests/libtest/lib650.c | 2 +- tests/libtest/lib651.c | 2 +- tests/libtest/lib652.c | 2 +- tests/libtest/lib653.c | 2 +- tests/libtest/lib654.c | 2 +- tests/libtest/lib655.c | 2 +- tests/libtest/lib658.c | 2 +- tests/libtest/lib659.c | 2 +- tests/libtest/lib661.c | 2 +- tests/libtest/lib666.c | 2 +- tests/libtest/lib667.c | 2 +- tests/libtest/lib668.c | 2 +- tests/libtest/lib670.c | 2 +- tests/libtest/lib674.c | 2 +- tests/libtest/lib676.c | 2 +- tests/libtest/lib677.c | 2 +- tests/libtest/lib678.c | 2 +- tests/libtest/lib694.c | 2 +- tests/libtest/lib695.c | 2 +- tests/libtest/lib751.c | 2 +- tests/libtest/lib753.c | 2 +- tests/libtest/memptr.c | 3 +- tests/libtest/mk-lib1521.pl | 2 +- tests/libtest/testtrace.c | 4 +- tests/libtest/testtrace.h | 1 + tests/libtest/testutil.c | 3 +- tests/libtest/testutil.h | 2 +- tests/server/Makefile.inc | 2 +- tests/server/dnsd.c | 27 +---- tests/server/first.c | 4 +- tests/server/first.h | 125 +++++++++++++++++++++ tests/server/getpart.c | 12 +-- tests/server/getpart.h | 38 ------- tests/server/mqttd.c | 22 +--- tests/server/resolve.c | 13 +-- tests/server/rtspd.c | 20 +--- tests/server/sockfilt.c | 19 +--- tests/server/socksd.c | 23 +--- tests/server/sws.c | 20 +--- tests/server/tftpd.c | 21 +--- tests/server/util.c | 173 +++++++----------------------- 259 files changed, 440 insertions(+), 570 deletions(-) delete mode 100644 tests/server/getpart.h diff --git a/scripts/mk-unity.pl b/scripts/mk-unity.pl index 21a5e944ef..a7d23f394f 100755 --- a/scripts/mk-unity.pl +++ b/scripts/mk-unity.pl @@ -97,6 +97,6 @@ foreach my $src (@src) { } if($any_test) { - print "\nstatic const struct entry_s s_entries[] = {\n$tlist};\n"; + print "\nconst struct entry_s s_entries[] = {\n$tlist {NULL, NULL}\n};\n"; print "\n#include \"first.c\"\n"; } diff --git a/tests/client/first.c b/tests/client/first.c index ca754a0f70..55d2e4b315 100644 --- a/tests/client/first.c +++ b/tests/client/first.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" int main(int argc, char **argv) { @@ -35,7 +36,7 @@ int main(int argc, char **argv) entry_name = argv[1]; entry_func = NULL; - for(tmp = 0; tmp < CURL_ARRAYSIZE(s_entries); ++tmp) { + for(tmp = 0; s_entries[tmp].ptr; ++tmp) { if(strcmp(entry_name, s_entries[tmp].name) == 0) { entry_func = s_entries[tmp].ptr; break; diff --git a/tests/client/first.h b/tests/client/first.h index 9aabc538e3..feeb52871a 100644 --- a/tests/client/first.h +++ b/tests/client/first.h @@ -32,6 +32,8 @@ struct entry_s { entry_func_t ptr; }; +extern const struct entry_s s_entries[]; + #include #include "curlx.h" diff --git a/tests/client/h2_pausing.c b/tests/client/h2_pausing.c index 811662f574..5ee360c463 100644 --- a/tests/client/h2_pausing.c +++ b/tests/client/h2_pausing.c @@ -23,6 +23,8 @@ ***************************************************************************/ /* This is based on the PoC client of issue #11982 */ +#include "first.h" + #include static void usage_h2_pausing(const char *msg) diff --git a/tests/client/h2_serverpush.c b/tests/client/h2_serverpush.c index 98b6e2b78f..fa65baf083 100644 --- a/tests/client/h2_serverpush.c +++ b/tests/client/h2_serverpush.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" static int my_trace(CURL *handle, curl_infotype type, char *data, size_t size, void *userp) diff --git a/tests/client/h2_upgrade_extreme.c b/tests/client/h2_upgrade_extreme.c index 46804cb485..2b15157417 100644 --- a/tests/client/h2_upgrade_extreme.c +++ b/tests/client/h2_upgrade_extreme.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" static size_t write_h2ue_cb(char *ptr, size_t size, size_t nmemb, void *opaque) { diff --git a/tests/client/hx_download.c b/tests/client/hx_download.c index 57906c2bf4..e168b93daf 100644 --- a/tests/client/hx_download.c +++ b/tests/client/hx_download.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" static int verbose_d = 1; diff --git a/tests/client/hx_upload.c b/tests/client/hx_upload.c index 994908088d..3cefdacfbf 100644 --- a/tests/client/hx_upload.c +++ b/tests/client/hx_upload.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" static int verbose_u = 1; diff --git a/tests/client/tls_session_reuse.c b/tests/client/tls_session_reuse.c index fc708411be..12bac86747 100644 --- a/tests/client/tls_session_reuse.c +++ b/tests/client/tls_session_reuse.c @@ -21,6 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" static size_t write_tse_cb(char *ptr, size_t size, size_t nmemb, void *opaque) { diff --git a/tests/client/upload_pausing.c b/tests/client/upload_pausing.c index 5a99c56d62..d02ad224e1 100644 --- a/tests/client/upload_pausing.c +++ b/tests/client/upload_pausing.c @@ -23,6 +23,8 @@ ***************************************************************************/ /* This is based on the PoC client of issue #11769 */ +#include "first.h" + static size_t total_read = 0; static size_t read_callback(char *ptr, size_t size, size_t nmemb, diff --git a/tests/client/ws_data.c b/tests/client/ws_data.c index 493809f807..8467c6ff79 100644 --- a/tests/client/ws_data.c +++ b/tests/client/ws_data.c @@ -21,6 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" + #ifndef CURL_DISABLE_WEBSOCKETS static CURLcode check_recv(const struct curl_ws_frame *frame, diff --git a/tests/client/ws_pingpong.c b/tests/client/ws_pingpong.c index 0059d315e4..9f6d62f942 100644 --- a/tests/client/ws_pingpong.c +++ b/tests/client/ws_pingpong.c @@ -21,6 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" + #ifndef CURL_DISABLE_WEBSOCKETS static CURLcode ping(CURL *curl, const char *send_payload) diff --git a/tests/libtest/first.c b/tests/libtest/first.c index b6bf2b1b9b..ee35494c26 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -21,6 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" + #ifdef HAVE_LOCALE_H # include /* for setlocale() */ #endif @@ -130,7 +132,7 @@ int main(int argc, char **argv) entry_name = argv[1]; entry_func = NULL; - for(tmp = 0; tmp < CURL_ARRAYSIZE(s_entries); ++tmp) { + for(tmp = 0; s_entries[tmp].ptr; ++tmp) { if(strcmp(entry_name, s_entries[tmp].name) == 0) { entry_func = s_entries[tmp].ptr; break; diff --git a/tests/libtest/first.h b/tests/libtest/first.h index ad56056dae..fcb623290c 100644 --- a/tests/libtest/first.h +++ b/tests/libtest/first.h @@ -32,6 +32,8 @@ struct entry_s { entry_func_t ptr; }; +extern const struct entry_s s_entries[]; + #include "curlx.h" #endif /* HEADER_LIBTEST_FIRST_H */ diff --git a/tests/libtest/lib1156.c b/tests/libtest/lib1156.c index 5abd9016d8..986dcb57ad 100644 --- a/tests/libtest/lib1156.c +++ b/tests/libtest/lib1156.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" /* Check range/resume returned error codes and data presence. diff --git a/tests/libtest/lib1308.c b/tests/libtest/lib1308.c index 44620e1388..520054ee21 100644 --- a/tests/libtest/lib1308.c +++ b/tests/libtest/lib1308.c @@ -40,7 +40,7 @@ static CURLcode test_lib1308(char *URL) char buffer[] = "test buffer"; rc = curl_formadd(&post, &last, CURLFORM_COPYNAME, "name", - CURLFORM_COPYCONTENTS, "content", CURLFORM_END); + CURLFORM_COPYCONTENTS, "content", CURLFORM_END); fail_unless(rc == 0, "curl_formadd returned error"); /* after the first curl_formadd when there's a single entry, both pointers diff --git a/tests/libtest/lib1485.c b/tests/libtest/lib1485.c index 6281c2f60d..b5908ad335 100644 --- a/tests/libtest/lib1485.c +++ b/tests/libtest/lib1485.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index 46f0268248..a193870c37 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c index 78d4ad1c8b..3b44db4745 100644 --- a/tests/libtest/lib1501.c +++ b/tests/libtest/lib1501.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index 858b4be4ca..51d33afa65 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -29,7 +29,7 @@ * leak in the CURLOPT_RESOLVE handling with the multi interface. */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib1506.c b/tests/libtest/lib1506.c index 569a65950f..161c81c818 100644 --- a/tests/libtest/lib1506.c +++ b/tests/libtest/lib1506.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c index b94e92a85f..fb52b996b3 100644 --- a/tests/libtest/lib1507.c +++ b/tests/libtest/lib1507.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "timediff.h" diff --git a/tests/libtest/lib1508.c b/tests/libtest/lib1508.c index b80d7858cd..1769b5327d 100644 --- a/tests/libtest/lib1508.c +++ b/tests/libtest/lib1508.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1509.c b/tests/libtest/lib1509.c index a9e8a880b3..7039572563 100644 --- a/tests/libtest/lib1509.c +++ b/tests/libtest/lib1509.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1510.c b/tests/libtest/lib1510.c index 56261e1f53..26cea287b7 100644 --- a/tests/libtest/lib1510.c +++ b/tests/libtest/lib1510.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1511.c b/tests/libtest/lib1511.c index 0402421fa6..9a84c8d509 100644 --- a/tests/libtest/lib1511.c +++ b/tests/libtest/lib1511.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c index 8bde4c9454..2841be63fb 100644 --- a/tests/libtest/lib1512.c +++ b/tests/libtest/lib1512.c @@ -28,7 +28,7 @@ * easy transfer finds and uses the populated stuff. */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1513.c b/tests/libtest/lib1513.c index 2ca54ec12b..545bf90abe 100644 --- a/tests/libtest/lib1513.c +++ b/tests/libtest/lib1513.c @@ -28,7 +28,7 @@ * of 42 (CURLE_ABORTED_BY_CALLBACK). */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1514.c b/tests/libtest/lib1514.c index 68cf384171..33c4f2ab03 100644 --- a/tests/libtest/lib1514.c +++ b/tests/libtest/lib1514.c @@ -26,7 +26,7 @@ * size is unknown. */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c index df82b2a81d..e65c33975c 100644 --- a/tests/libtest/lib1515.c +++ b/tests/libtest/lib1515.c @@ -28,7 +28,7 @@ * (test1515) nor a dead connection is detected (test1616). */ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "testutil.h" diff --git a/tests/libtest/lib1517.c b/tests/libtest/lib1517.c index c997b33581..bb1d3f248a 100644 --- a/tests/libtest/lib1517.c +++ b/tests/libtest/lib1517.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1518.c b/tests/libtest/lib1518.c index 59a67d5bca..3d93cf5edd 100644 --- a/tests/libtest/lib1518.c +++ b/tests/libtest/lib1518.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c index 68b1ca8914..76e5d5f0ec 100644 --- a/tests/libtest/lib1520.c +++ b/tests/libtest/lib1520.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1522.c b/tests/libtest/lib1522.c index f225b98c32..750ecc9b0b 100644 --- a/tests/libtest/lib1522.c +++ b/tests/libtest/lib1522.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" /* test case and code based on https://github.com/curl/curl/issues/2847 */ diff --git a/tests/libtest/lib1523.c b/tests/libtest/lib1523.c index 480d569afb..728a4c94b7 100644 --- a/tests/libtest/lib1523.c +++ b/tests/libtest/lib1523.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" /* test case and code based on https://github.com/curl/curl/issues/3927 */ diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index e015f3c11b..e76951f23e 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -28,7 +28,7 @@ * from server http header */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index 492eeb103c..6a15857795 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -27,7 +27,7 @@ * from server http header */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1527.c b/tests/libtest/lib1527.c index 4f710e9932..2fff74f7ce 100644 --- a/tests/libtest/lib1527.c +++ b/tests/libtest/lib1527.c @@ -27,7 +27,7 @@ * for server and proxy */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1528.c b/tests/libtest/lib1528.c index 1962749065..641487ba9e 100644 --- a/tests/libtest/lib1528.c +++ b/tests/libtest/lib1528.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1529.c b/tests/libtest/lib1529.c index bcb56da0e9..b40270934f 100644 --- a/tests/libtest/lib1529.c +++ b/tests/libtest/lib1529.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1530.c b/tests/libtest/lib1530.c index 0c922eaf7f..aa0529b3dd 100644 --- a/tests/libtest/lib1530.c +++ b/tests/libtest/lib1530.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c index 32e8abdfbc..0a9266a645 100644 --- a/tests/libtest/lib1531.c +++ b/tests/libtest/lib1531.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "timediff.h" diff --git a/tests/libtest/lib1532.c b/tests/libtest/lib1532.c index 34e27a5a9a..94e29cb29c 100644 --- a/tests/libtest/lib1532.c +++ b/tests/libtest/lib1532.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c index 9dc869d79f..f74f612f72 100644 --- a/tests/libtest/lib1533.c +++ b/tests/libtest/lib1533.c @@ -29,7 +29,7 @@ * because this implies that the data has been sent completely to the server. */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1534.c b/tests/libtest/lib1534.c index e0dbee1022..d99b135a24 100644 --- a/tests/libtest/lib1534.c +++ b/tests/libtest/lib1534.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1535.c b/tests/libtest/lib1535.c index b142882dbd..602f71717f 100644 --- a/tests/libtest/lib1535.c +++ b/tests/libtest/lib1535.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1536.c b/tests/libtest/lib1536.c index 23ed716ac2..dd0a2bf7d5 100644 --- a/tests/libtest/lib1536.c +++ b/tests/libtest/lib1536.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1537.c b/tests/libtest/lib1537.c index 547f9ef7f2..56f018395c 100644 --- a/tests/libtest/lib1537.c +++ b/tests/libtest/lib1537.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1538.c b/tests/libtest/lib1538.c index e00bf94375..fc816d358d 100644 --- a/tests/libtest/lib1538.c +++ b/tests/libtest/lib1538.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1540.c b/tests/libtest/lib1540.c index 0ed265c42a..26af4771eb 100644 --- a/tests/libtest/lib1540.c +++ b/tests/libtest/lib1540.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "testutil.h" diff --git a/tests/libtest/lib1541.c b/tests/libtest/lib1541.c index 9ef42a2adf..a1f905649e 100644 --- a/tests/libtest/lib1541.c +++ b/tests/libtest/lib1541.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1542.c b/tests/libtest/lib1542.c index 00c44dc17a..e47f128c28 100644 --- a/tests/libtest/lib1542.c +++ b/tests/libtest/lib1542.c @@ -30,7 +30,7 @@ * first connection and open a second. */ -#include "test.h" +#include "first.h" #include "testutil.h" #include "testtrace.h" diff --git a/tests/libtest/lib1545.c b/tests/libtest/lib1545.c index b485ab3f9d..e29c872f5f 100644 --- a/tests/libtest/lib1545.c +++ b/tests/libtest/lib1545.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" static CURLcode test_lib1545(char *URL) { diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c index 994623d71a..29e8407d3b 100644 --- a/tests/libtest/lib1550.c +++ b/tests/libtest/lib1550.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1551.c b/tests/libtest/lib1551.c index 253eb2626c..e6162eff6f 100644 --- a/tests/libtest/lib1551.c +++ b/tests/libtest/lib1551.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1552.c b/tests/libtest/lib1552.c index ffd08dc2c2..602c59dd3f 100644 --- a/tests/libtest/lib1552.c +++ b/tests/libtest/lib1552.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1553.c b/tests/libtest/lib1553.c index 317d8c8c57..57287885e1 100644 --- a/tests/libtest/lib1553.c +++ b/tests/libtest/lib1553.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "testtrace.h" diff --git a/tests/libtest/lib1554.c b/tests/libtest/lib1554.c index 6e7717fa35..51084a2c20 100644 --- a/tests/libtest/lib1554.c +++ b/tests/libtest/lib1554.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1555.c b/tests/libtest/lib1555.c index 02db62e5b5..39c9ad5cb9 100644 --- a/tests/libtest/lib1555.c +++ b/tests/libtest/lib1555.c @@ -25,7 +25,7 @@ * Verify that some API functions are locked from being called inside callback */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1556.c b/tests/libtest/lib1556.c index 7e7ee1e07c..a5e5bde2b7 100644 --- a/tests/libtest/lib1556.c +++ b/tests/libtest/lib1556.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1557.c b/tests/libtest/lib1557.c index 19012c35cb..f65fa9fad0 100644 --- a/tests/libtest/lib1557.c +++ b/tests/libtest/lib1557.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1558.c b/tests/libtest/lib1558.c index d0a9004ec4..51829e1d4e 100644 --- a/tests/libtest/lib1558.c +++ b/tests/libtest/lib1558.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1559.c b/tests/libtest/lib1559.c index efc176333f..e933f925c3 100644 --- a/tests/libtest/lib1559.c +++ b/tests/libtest/lib1559.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index e78a0a2e33..b2294a112f 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -30,7 +30,7 @@ * that this test will assume to be present! */ -#include "test.h" +#include "first.h" #if defined(USE_LIBIDN2) || defined(USE_WIN32_IDN) || defined(USE_APPLE_IDN) #define USE_IDN #endif diff --git a/tests/libtest/lib1564.c b/tests/libtest/lib1564.c index e733f0d707..a95645f139 100644 --- a/tests/libtest/lib1564.c +++ b/tests/libtest/lib1564.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1565.c b/tests/libtest/lib1565.c index 76a66c4548..03fd94014d 100644 --- a/tests/libtest/lib1565.c +++ b/tests/libtest/lib1565.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1567.c b/tests/libtest/lib1567.c index e519cd167d..bdac6c6afa 100644 --- a/tests/libtest/lib1567.c +++ b/tests/libtest/lib1567.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1568.c b/tests/libtest/lib1568.c index b9c873cf44..e3d9053af6 100644 --- a/tests/libtest/lib1568.c +++ b/tests/libtest/lib1568.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib1569.c b/tests/libtest/lib1569.c index 3671afbad6..a1a1d40a85 100644 --- a/tests/libtest/lib1569.c +++ b/tests/libtest/lib1569.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib1571.c b/tests/libtest/lib1571.c index 77a89f79fc..e18b5c3f21 100644 --- a/tests/libtest/lib1571.c +++ b/tests/libtest/lib1571.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1576.c b/tests/libtest/lib1576.c index de87a25dc9..c9b1c9d7ce 100644 --- a/tests/libtest/lib1576.c +++ b/tests/libtest/lib1576.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1591.c b/tests/libtest/lib1591.c index a601f19574..562a157616 100644 --- a/tests/libtest/lib1591.c +++ b/tests/libtest/lib1591.c @@ -27,7 +27,7 @@ * from server http header */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib1592.c b/tests/libtest/lib1592.c index 2331664c7c..5a108a9f8a 100644 --- a/tests/libtest/lib1592.c +++ b/tests/libtest/lib1592.c @@ -36,7 +36,7 @@ the default TEST_HANG_TIMEOUT to avoid issues when running on overloaded CI machines. */ -#include "test.h" +#include "first.h" #include "testutil.h" diff --git a/tests/libtest/lib1593.c b/tests/libtest/lib1593.c index e723fed620..803e410b90 100644 --- a/tests/libtest/lib1593.c +++ b/tests/libtest/lib1593.c @@ -24,7 +24,7 @@ /* Test suppressing the If-Modified-Since header */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1594.c b/tests/libtest/lib1594.c index 152a585569..283cea1b89 100644 --- a/tests/libtest/lib1594.c +++ b/tests/libtest/lib1594.c @@ -24,7 +24,7 @@ /* Testing Retry-After header parser */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1597.c b/tests/libtest/lib1597.c index 02779887d3..ab669c35b1 100644 --- a/tests/libtest/lib1597.c +++ b/tests/libtest/lib1597.c @@ -24,7 +24,7 @@ /* Testing CURLOPT_PROTOCOLS_STR */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1598.c b/tests/libtest/lib1598.c index cba749b7d3..baab3770c3 100644 --- a/tests/libtest/lib1598.c +++ b/tests/libtest/lib1598.c @@ -27,7 +27,7 @@ * from server http header */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib1599.c b/tests/libtest/lib1599.c index 30f2033226..d7c7c49241 100644 --- a/tests/libtest/lib1599.c +++ b/tests/libtest/lib1599.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" diff --git a/tests/libtest/lib1662.c b/tests/libtest/lib1662.c index ba389e0b95..416b3b729b 100644 --- a/tests/libtest/lib1662.c +++ b/tests/libtest/lib1662.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" struct t1662_WriteThis { size_t sizeleft; diff --git a/tests/libtest/lib1900.c b/tests/libtest/lib1900.c index 4f58fda2c5..622b20f245 100644 --- a/tests/libtest/lib1900.c +++ b/tests/libtest/lib1900.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1901.c b/tests/libtest/lib1901.c index c6199cf003..e3fdd2152d 100644 --- a/tests/libtest/lib1901.c +++ b/tests/libtest/lib1901.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1903.c b/tests/libtest/lib1903.c index d2171746b4..79b9ffbd5c 100644 --- a/tests/libtest/lib1903.c +++ b/tests/libtest/lib1903.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "timediff.h" diff --git a/tests/libtest/lib1905.c b/tests/libtest/lib1905.c index e0cb311530..b81ab440fb 100644 --- a/tests/libtest/lib1905.c +++ b/tests/libtest/lib1905.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "timediff.h" diff --git a/tests/libtest/lib1906.c b/tests/libtest/lib1906.c index 89eef4fb9c..1f2415e36d 100644 --- a/tests/libtest/lib1906.c +++ b/tests/libtest/lib1906.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1907.c b/tests/libtest/lib1907.c index 6591023b08..aad70b9a9e 100644 --- a/tests/libtest/lib1907.c +++ b/tests/libtest/lib1907.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1908.c b/tests/libtest/lib1908.c index 498d94b41f..521b38c003 100644 --- a/tests/libtest/lib1908.c +++ b/tests/libtest/lib1908.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1910.c b/tests/libtest/lib1910.c index 58d40c4305..b8779f6a0d 100644 --- a/tests/libtest/lib1910.c +++ b/tests/libtest/lib1910.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1911.c b/tests/libtest/lib1911.c index e76455d55f..3d3787744e 100644 --- a/tests/libtest/lib1911.c +++ b/tests/libtest/lib1911.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1912.c b/tests/libtest/lib1912.c index 19ea5b6eb0..9eabe2f671 100644 --- a/tests/libtest/lib1912.c +++ b/tests/libtest/lib1912.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1913.c b/tests/libtest/lib1913.c index c7d526c918..76b01b6789 100644 --- a/tests/libtest/lib1913.c +++ b/tests/libtest/lib1913.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1915.c b/tests/libtest/lib1915.c index bb7fa3043f..24e79d4014 100644 --- a/tests/libtest/lib1915.c +++ b/tests/libtest/lib1915.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "testutil.h" diff --git a/tests/libtest/lib1916.c b/tests/libtest/lib1916.c index 716d405b5f..9dcbd45c0c 100644 --- a/tests/libtest/lib1916.c +++ b/tests/libtest/lib1916.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1918.c b/tests/libtest/lib1918.c index bf26e849d5..c70a07bb8c 100644 --- a/tests/libtest/lib1918.c +++ b/tests/libtest/lib1918.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1919.c b/tests/libtest/lib1919.c index 43b362f851..5f718c08ac 100644 --- a/tests/libtest/lib1919.c +++ b/tests/libtest/lib1919.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1933.c b/tests/libtest/lib1933.c index 6cb4509d7c..67b93a170d 100644 --- a/tests/libtest/lib1933.c +++ b/tests/libtest/lib1933.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1934.c b/tests/libtest/lib1934.c index 7f10aa505c..097ccecfd6 100644 --- a/tests/libtest/lib1934.c +++ b/tests/libtest/lib1934.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1935.c b/tests/libtest/lib1935.c index b515ed205e..4be038f708 100644 --- a/tests/libtest/lib1935.c +++ b/tests/libtest/lib1935.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1936.c b/tests/libtest/lib1936.c index 327fa9f2be..9992507d94 100644 --- a/tests/libtest/lib1936.c +++ b/tests/libtest/lib1936.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1937.c b/tests/libtest/lib1937.c index acfb5eb4e9..be69974039 100644 --- a/tests/libtest/lib1937.c +++ b/tests/libtest/lib1937.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1938.c b/tests/libtest/lib1938.c index a5e9e7f73a..90707c8553 100644 --- a/tests/libtest/lib1938.c +++ b/tests/libtest/lib1938.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1939.c b/tests/libtest/lib1939.c index 260da18110..a909bb7333 100644 --- a/tests/libtest/lib1939.c +++ b/tests/libtest/lib1939.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1940.c b/tests/libtest/lib1940.c index 03cdc9d546..cfd5ab6b61 100644 --- a/tests/libtest/lib1940.c +++ b/tests/libtest/lib1940.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1945.c b/tests/libtest/lib1945.c index ff2e670cf9..334047ca3e 100644 --- a/tests/libtest/lib1945.c +++ b/tests/libtest/lib1945.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1947.c b/tests/libtest/lib1947.c index 5dc305343e..a6c0555506 100644 --- a/tests/libtest/lib1947.c +++ b/tests/libtest/lib1947.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1948.c b/tests/libtest/lib1948.c index 10e762d8d0..1aa1915e57 100644 --- a/tests/libtest/lib1948.c +++ b/tests/libtest/lib1948.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" typedef struct { diff --git a/tests/libtest/lib1955.c b/tests/libtest/lib1955.c index aef6015ccd..0206b81ad7 100644 --- a/tests/libtest/lib1955.c +++ b/tests/libtest/lib1955.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1956.c b/tests/libtest/lib1956.c index c1063fefe1..d2ffdd912e 100644 --- a/tests/libtest/lib1956.c +++ b/tests/libtest/lib1956.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1957.c b/tests/libtest/lib1957.c index c6ca327de5..99ff21a6b0 100644 --- a/tests/libtest/lib1957.c +++ b/tests/libtest/lib1957.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1958.c b/tests/libtest/lib1958.c index 8073e3e85e..811ff2c0e6 100644 --- a/tests/libtest/lib1958.c +++ b/tests/libtest/lib1958.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1959.c b/tests/libtest/lib1959.c index f5db0e5c65..1b1f5b5731 100644 --- a/tests/libtest/lib1959.c +++ b/tests/libtest/lib1959.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1960.c b/tests/libtest/lib1960.c index 9aaf20e341..2df9f119ee 100644 --- a/tests/libtest/lib1960.c +++ b/tests/libtest/lib1960.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_INET_PTON diff --git a/tests/libtest/lib1964.c b/tests/libtest/lib1964.c index f0adaf0b96..ddc47ee956 100644 --- a/tests/libtest/lib1964.c +++ b/tests/libtest/lib1964.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1970.c b/tests/libtest/lib1970.c index f7834958aa..5e2f8cc4b9 100644 --- a/tests/libtest/lib1970.c +++ b/tests/libtest/lib1970.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1971.c b/tests/libtest/lib1971.c index 6bbac57581..e67b9022b3 100644 --- a/tests/libtest/lib1971.c +++ b/tests/libtest/lib1971.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1972.c b/tests/libtest/lib1972.c index 65a581d611..d268be5b93 100644 --- a/tests/libtest/lib1972.c +++ b/tests/libtest/lib1972.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1973.c b/tests/libtest/lib1973.c index b2a4a7f7ed..a3afd3bba5 100644 --- a/tests/libtest/lib1973.c +++ b/tests/libtest/lib1973.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1974.c b/tests/libtest/lib1974.c index 75a92a2915..4640e18873 100644 --- a/tests/libtest/lib1974.c +++ b/tests/libtest/lib1974.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1975.c b/tests/libtest/lib1975.c index f7dc16e170..cc8483fe57 100644 --- a/tests/libtest/lib1975.c +++ b/tests/libtest/lib1975.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib1977.c b/tests/libtest/lib1977.c index 53ad7d55bd..b73db82354 100644 --- a/tests/libtest/lib1977.c +++ b/tests/libtest/lib1977.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib1978.c b/tests/libtest/lib1978.c index 7fdd11e262..6ab0a034be 100644 --- a/tests/libtest/lib1978.c +++ b/tests/libtest/lib1978.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib2023.c b/tests/libtest/lib2023.c index 8359bdef33..eb8e357da8 100644 --- a/tests/libtest/lib2023.c +++ b/tests/libtest/lib2023.c @@ -26,7 +26,7 @@ * argv3 = second auth type */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib2032.c b/tests/libtest/lib2032.c index 9d5a1ea61c..936de92871 100644 --- a/tests/libtest/lib2032.c +++ b/tests/libtest/lib2032.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include #include diff --git a/tests/libtest/lib2082.c b/tests/libtest/lib2082.c index cb4af87ca6..ca73a4dbd8 100644 --- a/tests/libtest/lib2082.c +++ b/tests/libtest/lib2082.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" typedef struct prcs { int prereq_retcode; diff --git a/tests/libtest/lib2301.c b/tests/libtest/lib2301.c index 6562a50541..08c5d9d543 100644 --- a/tests/libtest/lib2301.c +++ b/tests/libtest/lib2301.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifndef CURL_DISABLE_WEBSOCKETS #if 0 diff --git a/tests/libtest/lib2302.c b/tests/libtest/lib2302.c index 9e302fdb8f..1251d65749 100644 --- a/tests/libtest/lib2302.c +++ b/tests/libtest/lib2302.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifndef CURL_DISABLE_WEBSOCKETS diff --git a/tests/libtest/lib2304.c b/tests/libtest/lib2304.c index d4d583ff5c..750325045c 100644 --- a/tests/libtest/lib2304.c +++ b/tests/libtest/lib2304.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifndef CURL_DISABLE_WEBSOCKETS diff --git a/tests/libtest/lib2306.c b/tests/libtest/lib2306.c index 3adaedc7b6..4f25c29116 100644 --- a/tests/libtest/lib2306.c +++ b/tests/libtest/lib2306.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" diff --git a/tests/libtest/lib2308.c b/tests/libtest/lib2308.c index d921f53b92..26fac9b7f1 100644 --- a/tests/libtest/lib2308.c +++ b/tests/libtest/lib2308.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c index aff7bb7ef5..928b007f40 100644 --- a/tests/libtest/lib2309.c +++ b/tests/libtest/lib2309.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" diff --git a/tests/libtest/lib2402.c b/tests/libtest/lib2402.c index 5a036881c5..f633b469a9 100644 --- a/tests/libtest/lib2402.c +++ b/tests/libtest/lib2402.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib2404.c b/tests/libtest/lib2404.c index c9383c48e7..9f0f5aa20e 100644 --- a/tests/libtest/lib2404.c +++ b/tests/libtest/lib2404.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib2405.c b/tests/libtest/lib2405.c index d7f39f37f3..2302ae1fd3 100644 --- a/tests/libtest/lib2405.c +++ b/tests/libtest/lib2405.c @@ -37,7 +37,7 @@ * successfully. */ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib2502.c b/tests/libtest/lib2502.c index fe1b9c7838..6eb0dd144f 100644 --- a/tests/libtest/lib2502.c +++ b/tests/libtest/lib2502.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "testutil.h" diff --git a/tests/libtest/lib2700.c b/tests/libtest/lib2700.c index 37258a0fd9..d2eff5577b 100644 --- a/tests/libtest/lib2700.c +++ b/tests/libtest/lib2700.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib3010.c b/tests/libtest/lib3010.c index 6bc6678c0c..05979ad124 100644 --- a/tests/libtest/lib3010.c +++ b/tests/libtest/lib3010.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3025.c b/tests/libtest/lib3025.c index 37f1d9e860..37d2d68079 100644 --- a/tests/libtest/lib3025.c +++ b/tests/libtest/lib3025.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3026.c b/tests/libtest/lib3026.c index 50d2d40995..a595deaa6c 100644 --- a/tests/libtest/lib3026.c +++ b/tests/libtest/lib3026.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" diff --git a/tests/libtest/lib3027.c b/tests/libtest/lib3027.c index 1ffd58458a..7f79a37bc6 100644 --- a/tests/libtest/lib3027.c +++ b/tests/libtest/lib3027.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib3100.c b/tests/libtest/lib3100.c index 0b22f86de2..7942b9972c 100644 --- a/tests/libtest/lib3100.c +++ b/tests/libtest/lib3100.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3101.c b/tests/libtest/lib3101.c index 7a63d8a173..b6e5b3ca09 100644 --- a/tests/libtest/lib3101.c +++ b/tests/libtest/lib3101.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3102.c b/tests/libtest/lib3102.c index 1adbbeed70..06287d2111 100644 --- a/tests/libtest/lib3102.c +++ b/tests/libtest/lib3102.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3103.c b/tests/libtest/lib3103.c index 2ed9acafc7..be607125d2 100644 --- a/tests/libtest/lib3103.c +++ b/tests/libtest/lib3103.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3104.c b/tests/libtest/lib3104.c index 0dbd8ef9e5..20c2c154ef 100644 --- a/tests/libtest/lib3104.c +++ b/tests/libtest/lib3104.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib3105.c b/tests/libtest/lib3105.c index 426c7f4270..cd9e7a7eab 100644 --- a/tests/libtest/lib3105.c +++ b/tests/libtest/lib3105.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib3207.c b/tests/libtest/lib3207.c index 938867eb43..d2e1806af7 100644 --- a/tests/libtest/lib3207.c +++ b/tests/libtest/lib3207.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib3208.c b/tests/libtest/lib3208.c index c67ab8573a..55ea21d16e 100644 --- a/tests/libtest/lib3208.c +++ b/tests/libtest/lib3208.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c index 70e6e3f811..84cd79346b 100644 --- a/tests/libtest/lib500.c +++ b/tests/libtest/lib500.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index 36f0434e68..e770a72d4e 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index db92531316..0c6feb8c53 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c index 8f1bc4eaeb..87e679e908 100644 --- a/tests/libtest/lib503.c +++ b/tests/libtest/lib503.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c index c530ee0c0a..49afc851e2 100644 --- a/tests/libtest/lib504.c +++ b/tests/libtest/lib504.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 3c4a710c00..fd56fe4624 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 51c8ff09c5..384bf26db6 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 187106f24b..23c5b58c31 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index 0e11dae26f..0cb749103f 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index a508ac07ad..37358c98dc 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index 7c84bc5bab..bef9260c4e 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c index e92cb4cb36..30b31469f7 100644 --- a/tests/libtest/lib511.c +++ b/tests/libtest/lib511.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c index c2df035059..458227eeb4 100644 --- a/tests/libtest/lib512.c +++ b/tests/libtest/lib512.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index a5b1212dfa..51749b9fda 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index ebc3ae67d8..8580d44999 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index c7a1954d3d..511f077540 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index 48f1dba519..8582110c3e 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index 6a0a559259..cefc42f7fd 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index 3ff8d5a536..a992cb1b87 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index baae719ae6..7848681bc4 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index 5d76e0df1e..6b8f4edd06 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index 156f156dac..9230984344 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index 6ef2ce0818..4b8a52660b 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index e727985e23..884afb7b77 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index 3a6de9558a..4c49f29fe2 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 370e4905e2..85221652a4 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -40,7 +40,7 @@ * with HTTP. */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index c558799b22..2c7dfdf5db 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -28,7 +28,7 @@ * aborted correctly. */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 05d31ca2b1..4dae47a85a 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -23,7 +23,7 @@ ***************************************************************************/ /* used for test case 533, 534, 535 and 546 */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index c5d9bc21d0..6e5a83cab9 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 7970a05689..c4964b82e0 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index b966e0c022..f2c302cf4e 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index 3ec58c1cda..9b6f118732 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -30,7 +30,7 @@ * argv4 = host name to use for the custom Host: header */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 4a78c92ab3..33411117f4 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index d8f4f35057..9e3a2aa898 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index e568bfc2b8..d759e5eb03 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -23,7 +23,7 @@ ***************************************************************************/ /* Based on Alex Fishman's bug report on September 30, 2007 */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index 60fb63d7c6..0a70b72e7e 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index e57fa3172d..829f8fdd62 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -26,7 +26,7 @@ * argv3 = proxyuser:password */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index a0ffa139b9..555cd7d620 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -26,7 +26,7 @@ * argv3 = non-zero means ASCII transfer */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 8272af8548..3fbdac130e 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -25,7 +25,7 @@ * argv2 = proxy with embedded user+password */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index af9e903b09..e1933821bd 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -26,7 +26,7 @@ * bug report #1871269, fixed on Jan 14 2008 before the 7.18.0 release. */ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index c9d62e0d55..49d95a1259 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 16eff34f26..87706c2dff 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -30,7 +30,7 @@ * argv3 = proxyuser:password */ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 964a190718..9c21d581fe 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index aa6edbda27..df1eb69cbf 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -27,7 +27,7 @@ * curl_m*printf formatting capabilities and handling of some data types. */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index 9b7ef56dfb..07f75dcd9d 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib559.c b/tests/libtest/lib559.c index cfd2c914b2..0b6eb308e6 100644 --- a/tests/libtest/lib559.c +++ b/tests/libtest/lib559.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index 2f372f52fe..712820dd52 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c index 5c6671fe12..5e010784ab 100644 --- a/tests/libtest/lib562.c +++ b/tests/libtest/lib562.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_FCNTL_H #include diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c index 7e77392504..ed64a64fb9 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c index cf4ed0db3e..fc9d929f3d 100644 --- a/tests/libtest/lib566.c +++ b/tests/libtest/lib566.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c index c6b8a3319c..6752935469 100644 --- a/tests/libtest/lib567.c +++ b/tests/libtest/lib567.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c index 59d37ec84e..e69ab97798 100644 --- a/tests/libtest/lib568.c +++ b/tests/libtest/lib568.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_SYS_STAT_H #include diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c index aacaa38328..57cb460268 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c index 30f2c40db5..76eddfb032 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index fc9d874910..865b158adf 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_NETINET_IN_H # include diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c index 9df4be847a..d03934c93b 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #ifdef HAVE_SYS_STAT_H #include diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c index 19562acb93..fa49ae18ff 100644 --- a/tests/libtest/lib573.c +++ b/tests/libtest/lib573.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testtrace.h" #include "testutil.h" diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c index 4c78214548..de12349a28 100644 --- a/tests/libtest/lib574.c +++ b/tests/libtest/lib574.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c index 53bd77b9ec..a4c1aedb75 100644 --- a/tests/libtest/lib575.c +++ b/tests/libtest/lib575.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index e0765415b0..e52c228aa2 100644 --- a/tests/libtest/lib576.c +++ b/tests/libtest/lib576.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index 5b987febf1..22a2cf17bb 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index c1d8f2fd12..fd47d55be9 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index 47a93f003f..c887559695 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c index 8e41e298e3..691e142e35 100644 --- a/tests/libtest/lib583.c +++ b/tests/libtest/lib583.c @@ -26,7 +26,7 @@ * https://curl.se/mail/lib-2011-03/0066.html */ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index e8a8034f1e..feb7ecdd12 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib589.c b/tests/libtest/lib589.c index 94eb911b5f..760b2dcde8 100644 --- a/tests/libtest/lib589.c +++ b/tests/libtest/lib589.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index b9f0377fbf..ffa30c6fce 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" /* Based on a bug report recipe by Rene Bernhardt in diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index b28bed638e..6a9f03f849 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" /* lib591 is used for test cases 591, 592, 593 and 594 */ diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c index e38cd6784f..5c11fc8809 100644 --- a/tests/libtest/lib597.c +++ b/tests/libtest/lib597.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c index 2cf5fa37d7..fdcb9fe3a6 100644 --- a/tests/libtest/lib598.c +++ b/tests/libtest/lib598.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c index c22e925b17..116ae648f9 100644 --- a/tests/libtest/lib599.c +++ b/tests/libtest/lib599.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib643.c b/tests/libtest/lib643.c index 6428f99822..95c562387d 100644 --- a/tests/libtest/lib643.c +++ b/tests/libtest/lib643.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib650.c b/tests/libtest/lib650.c index 856670ffd4..d20a8f2b52 100644 --- a/tests/libtest/lib650.c +++ b/tests/libtest/lib650.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib651.c b/tests/libtest/lib651.c index 6b5f9d5e4f..cb029abe4c 100644 --- a/tests/libtest/lib651.c +++ b/tests/libtest/lib651.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib652.c b/tests/libtest/lib652.c index c3f11f147f..e5c6a2bebb 100644 --- a/tests/libtest/lib652.c +++ b/tests/libtest/lib652.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib653.c b/tests/libtest/lib653.c index bbc3c4478c..f2a00447be 100644 --- a/tests/libtest/lib653.c +++ b/tests/libtest/lib653.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "warnless.h" diff --git a/tests/libtest/lib654.c b/tests/libtest/lib654.c index 69223643bd..e3b9d2f6f2 100644 --- a/tests/libtest/lib654.c +++ b/tests/libtest/lib654.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib655.c b/tests/libtest/lib655.c index 0915da3dd3..34d5f8a3bf 100644 --- a/tests/libtest/lib655.c +++ b/tests/libtest/lib655.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib658.c b/tests/libtest/lib658.c index 5b8662e6e4..d0eb222b37 100644 --- a/tests/libtest/lib658.c +++ b/tests/libtest/lib658.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib659.c b/tests/libtest/lib659.c index 57a5ff17f1..941ca7370c 100644 --- a/tests/libtest/lib659.c +++ b/tests/libtest/lib659.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib661.c b/tests/libtest/lib661.c index de75963134..84b867c6a1 100644 --- a/tests/libtest/lib661.c +++ b/tests/libtest/lib661.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib666.c b/tests/libtest/lib666.c index 5696181e1d..b4034b7a01 100644 --- a/tests/libtest/lib666.c +++ b/tests/libtest/lib666.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib667.c b/tests/libtest/lib667.c index 999f703909..d9053d2818 100644 --- a/tests/libtest/lib667.c +++ b/tests/libtest/lib667.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib668.c b/tests/libtest/lib668.c index cdf09f618a..c787288e66 100644 --- a/tests/libtest/lib668.c +++ b/tests/libtest/lib668.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib670.c b/tests/libtest/lib670.c index b26605e3f5..c2f70d859b 100644 --- a/tests/libtest/lib670.c +++ b/tests/libtest/lib670.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include diff --git a/tests/libtest/lib674.c b/tests/libtest/lib674.c index 521c351bd8..48938b5d01 100644 --- a/tests/libtest/lib674.c +++ b/tests/libtest/lib674.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib676.c b/tests/libtest/lib676.c index f740b576a0..264127f707 100644 --- a/tests/libtest/lib676.c +++ b/tests/libtest/lib676.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib677.c b/tests/libtest/lib677.c index 33e39830ad..aa58ccf234 100644 --- a/tests/libtest/lib677.c +++ b/tests/libtest/lib677.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib678.c b/tests/libtest/lib678.c index d0c465f9f6..cc2216e2a9 100644 --- a/tests/libtest/lib678.c +++ b/tests/libtest/lib678.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib694.c b/tests/libtest/lib694.c index fd1b18b52e..071697838c 100644 --- a/tests/libtest/lib694.c +++ b/tests/libtest/lib694.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib695.c b/tests/libtest/lib695.c index 7769fc11e7..4eed2b8d17 100644 --- a/tests/libtest/lib695.c +++ b/tests/libtest/lib695.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "memdebug.h" diff --git a/tests/libtest/lib751.c b/tests/libtest/lib751.c index c1e36909bb..5623a20b89 100644 --- a/tests/libtest/lib751.c +++ b/tests/libtest/lib751.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib753.c b/tests/libtest/lib753.c index 9adbe3ef3d..27aec1d735 100644 --- a/tests/libtest/lib753.c +++ b/tests/libtest/lib753.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" #include "testutil.h" #include "testtrace.h" diff --git a/tests/libtest/memptr.c b/tests/libtest/memptr.c index 9f241031fb..ab72aa7725 100644 --- a/tests/libtest/memptr.c +++ b/tests/libtest/memptr.c @@ -21,7 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" +#include "first.h" + #include "curl_memory.h" #ifndef CURL_STATICLIB diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl index 95e38c4c02..a3b3951760 100755 --- a/tests/libtest/mk-lib1521.pl +++ b/tests/libtest/mk-lib1521.pl @@ -203,7 +203,7 @@ print $fh <
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c index 53c2651c6b..0b49c32f39 100644 --- a/tests/libtest/testtrace.c +++ b/tests/libtest/testtrace.c @@ -21,9 +21,9 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "test.h" -#include "testutil.h" #include "testtrace.h" +#include "testutil.h" + #include "memdebug.h" struct libtest_trace_cfg libtest_debug_config; diff --git a/tests/libtest/testtrace.h b/tests/libtest/testtrace.h index d7087c5366..dc064f4161 100644 --- a/tests/libtest/testtrace.h +++ b/tests/libtest/testtrace.h @@ -23,6 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "test.h" struct libtest_trace_cfg { int tracetime; /* 0 represents FALSE, anything else TRUE */ diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index e9672d82a3..2bf171bf00 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -21,9 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" -#include #include "testutil.h" + #include "memdebug.h" #ifdef _WIN32 diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h index 750506fb2e..d77ffb6015 100644 --- a/tests/libtest/testutil.h +++ b/tests/libtest/testutil.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "test.h" struct timeval tutil_tvnow(void); diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc index e93daa1581..84b4261dab 100644 --- a/tests/server/Makefile.inc +++ b/tests/server/Makefile.inc @@ -29,7 +29,7 @@ BUNDLE = servers FIRSTFILES = first.c first.h # Common files used by test programs -UTILS = getpart.c getpart.h util.c +UTILS = getpart.c util.c CURLX_CFILES = \ ../../lib/curlx/base64.c \ diff --git a/tests/server/dnsd.c b/tests/server/dnsd.c index d19d0344b1..069a93f33e 100644 --- a/tests/server/dnsd.c +++ b/tests/server/dnsd.c @@ -21,32 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ - -#include "curl_setup.h" - -#ifdef HAVE_SYS_IOCTL_H -#include -#endif -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_FCNTL_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - -#include - -#include /* from the private lib dir */ -#include "getpart.h" +#include "first.h" static int dnsd_wrotepidfile = 0; static int dnsd_wroteportfile = 0; diff --git a/tests/server/first.c b/tests/server/first.c index 430f3674de..0f30c78016 100644 --- a/tests/server/first.c +++ b/tests/server/first.c @@ -21,6 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "first.h" + #include #include @@ -37,7 +39,7 @@ int main(int argc, char **argv) entry_name = argv[1]; entry_func = NULL; - for(tmp = 0; tmp < CURL_ARRAYSIZE(s_entries); ++tmp) { + for(tmp = 0; s_entries[tmp].ptr; ++tmp) { if(strcmp(entry_name, s_entries[tmp].name) == 0) { entry_func = s_entries[tmp].ptr; break; diff --git a/tests/server/first.h b/tests/server/first.h index 6b14c5ee7c..1fc31f8ebc 100644 --- a/tests/server/first.h +++ b/tests/server/first.h @@ -23,6 +23,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ +#include "curl_setup.h" + typedef int (*entry_func_t)(int, char **); struct entry_s { @@ -30,4 +32,127 @@ struct entry_s { entry_func_t ptr; }; +extern const struct entry_s s_entries[]; + +#ifndef UNDER_CE +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_NETINET_IN6_H +#include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif + +#include /* from the private lib dir */ + +/* adjust for old MSVC */ +#if defined(_MSC_VER) && (_MSC_VER < 1900) +# define snprintf _snprintf +#endif + +#ifdef _WIN32 +# define CURL_STRNICMP(p1, p2, n) _strnicmp(p1, p2, n) +#elif defined(HAVE_STRCASECMP) +# ifdef HAVE_STRINGS_H +# include +# endif +# define CURL_STRNICMP(p1, p2, n) strncasecmp(p1, p2, n) +#elif defined(HAVE_STRCMPI) +# define CURL_STRNICMP(p1, p2, n) strncmpi(p1, p2, n) +#elif defined(HAVE_STRICMP) +# define CURL_STRNICMP(p1, p2, n) strnicmp(p1, p2, n) +#else +# error "missing case insensitive comparison function" +#endif + +enum { + DOCNUMBER_NOTHING = -7, + DOCNUMBER_QUIT = -6, + DOCNUMBER_BADCONNECT = -5, + DOCNUMBER_INTERNAL = -4, + DOCNUMBER_CONNECT = -3, + DOCNUMBER_WERULEZ = -2, + DOCNUMBER_404 = -1 +}; + +#include /* for curl_socket_t */ + +#ifdef USE_UNIX_SOCKETS +#ifdef HAVE_SYS_UN_H +#include /* for sockaddr_un */ +#endif +#endif /* USE_UNIX_SOCKETS */ + +typedef union { + struct sockaddr sa; + struct sockaddr_in sa4; +#ifdef USE_IPV6 + struct sockaddr_in6 sa6; +#endif +#ifdef USE_UNIX_SOCKETS + struct sockaddr_un sau; +#endif +} srvr_sockaddr_union_t; + +/* getpart */ +#define GPE_NO_BUFFER_SPACE -2 +#define GPE_OUT_OF_MEMORY -1 +#define GPE_OK 0 +#define GPE_END_OF_FILE 1 + +extern int getpart(char **outbuf, size_t *outlen, + const char *main, const char *sub, FILE *stream); + +/* utility functions */ +extern char *data_to_hex(char *data, size_t len); +extern void logmsg(const char *msg, ...); +extern void loghex(unsigned char *buffer, ssize_t len); +extern unsigned char byteval(char *value); +extern int win32_init(void); +extern const char *sstrerror(int err); +extern FILE *test2fopen(long testno, const char *logdir2); +extern curl_off_t our_getpid(void); +extern int write_pidfile(const char *filename); +extern int write_portfile(const char *filename, int port); +extern void set_advisor_read_lock(const char *filename); +extern void clear_advisor_read_lock(const char *filename); +static volatile int got_exit_signal = 0; +static volatile int exit_signal = 0; +#ifdef _WIN32 +static HANDLE exit_event = NULL; +#endif +extern void install_signal_handlers(bool keep_sigalrm); +extern void restore_signal_handlers(bool keep_sigalrm); +#ifdef USE_UNIX_SOCKETS +extern int bind_unix_socket(curl_socket_t sock, const char *unix_socket, + struct sockaddr_un *sau); +#endif +extern unsigned short util_ultous(unsigned long ulnum); + +/* global variables */ +static const char *srcpath = "."; /* pointing to the test dir */ +static const char *pidname = NULL; +static const char *portname = NULL; /* none by default */ +static const char *serverlogfile = NULL; +static int serverlogslocked; +static const char *configfile = NULL; +static const char *logdir = "log"; +static char loglockfile[256]; +#ifdef USE_IPV6 +static bool use_ipv6 = FALSE; +#endif +static const char *ipv_inuse = "IPv4"; +static unsigned short server_port = 0; +static const char *socket_type = "IPv4"; +static int socket_domain = AF_INET; + +#define SERVERLOGS_LOCKDIR "lock" /* within logdir */ + #endif /* HEADER_SERVER_FIRST_H */ diff --git a/tests/server/getpart.c b/tests/server/getpart.c index b881837055..8725f540b3 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -21,11 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" - -#include "getpart.h" -#include /* from the private lib dir */ -#include "curl_memory.h" +#include "first.h" #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++ @@ -43,6 +39,8 @@ #define system_strdup strdup #endif +#include "curl_memory.h" + #if defined(_MSC_VER) && defined(_DLL) # pragma warning(push) # pragma warning(disable:4232) /* MSVC extension, dllimport identity */ @@ -268,8 +266,8 @@ static int decodedata(char **buf, /* dest buffer */ * GPE_OUT_OF_MEMORY * GPE_OK */ -static int getpart(char **outbuf, size_t *outlen, - const char *main, const char *sub, FILE *stream) +int getpart(char **outbuf, size_t *outlen, + const char *main, const char *sub, FILE *stream) { # define MAX_TAG_LEN 200 char couter[MAX_TAG_LEN + 1]; /* current outermost section */ diff --git a/tests/server/getpart.h b/tests/server/getpart.h deleted file mode 100644 index e9b56f88d7..0000000000 --- a/tests/server/getpart.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef HEADER_CURL_SERVER_GETPART_H -#define HEADER_CURL_SERVER_GETPART_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) Daniel Stenberg, , 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 "curl_setup.h" - -#include "strdup.h" - -#define GPE_NO_BUFFER_SPACE -2 -#define GPE_OUT_OF_MEMORY -1 -#define GPE_OK 0 -#define GPE_END_OF_FILE 1 - -static int getpart(char **outbuf, size_t *outlen, - const char *main, const char *sub, FILE *stream); - -#endif /* HEADER_CURL_SERVER_GETPART_H */ diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index ef71460542..2c453f1c6d 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -21,7 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" + #include #include @@ -36,25 +37,6 @@ /* based on sockfilt.c */ -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - -#include /* from the private lib dir */ -#include "getpart.h" - #define MQTT_MSG_CONNECT 0x10 #define MQTT_MSG_CONNACK 0x20 #define MQTT_MSG_PUBLISH 0x30 diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 70d28a21b3..1d17146d90 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" /* Purpose * @@ -33,17 +33,6 @@ * */ -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef _XOPEN_SOURCE_EXTENDED -/* This define is "almost" required to build on HP-UX 11 */ -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - static int test_resolve(int argc, char *argv[]) { int arg = 1; diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 8de70566c2..1825361718 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" /* * curl's test suite Real Time Streaming Protocol (RTSP) server. @@ -29,28 +29,10 @@ * This source file was started based on curl's HTTP test suite server. */ -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif #ifdef HAVE_NETINET_TCP_H #include /* for TCP_NODELAY */ #endif -#include /* from the private lib dir */ -#include "getpart.h" - #undef REQBUFSIZ #define REQBUFSIZ 150000 diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 494cad156b..93aff96104 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" /* Purpose * @@ -85,23 +85,6 @@ * it! */ -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - -#include /* from the private lib dir */ /* buffer is this excessively large only to be able to support things like test 1003 which tests exceedingly large server response lines */ diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 46e4b4d88c..64c55a64e7 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -21,7 +21,8 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" + #include /* Function @@ -57,24 +58,6 @@ /* based on sockfilt.c */ -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - -#include /* from the private lib dir */ - static const char *backendaddr = "127.0.0.1"; static unsigned short backendport = 0; /* default is use client's */ @@ -824,7 +807,7 @@ static curl_socket_t socksd_sockdaemon(curl_socket_t sock, #endif /* USE_IPV6 */ #ifdef USE_UNIX_SOCKETS case AF_UNIX: - rc = bind_unix_socket(sock, unix_socket, &listener.sau); + rc = bind_unix_socket(sock, unix_socket, &listener.sau); #endif } diff --git a/tests/server/sws.c b/tests/server/sws.c index 8c818f3d26..30bc2f0f61 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" /* sws.c: simple (silly?) web server @@ -30,28 +30,10 @@ */ -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif #ifdef HAVE_NETINET_TCP_H #include /* for TCP_NODELAY */ #endif -#include /* from the private lib dir */ -#include "getpart.h" - static bool use_gopher = FALSE; static bool is_proxy = FALSE; diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index a590936944..1505d4de17 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -49,27 +49,14 @@ * * SPDX-License-Identifier: BSD-4-Clause-UC */ - -#include "curl_setup.h" +#include "first.h" #ifdef HAVE_SYS_IOCTL_H -#include -#endif -#ifndef UNDER_CE -#include +#include /* for ioctl() */ #endif #ifdef HAVE_FCNTL_H #include #endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif #ifdef HAVE_SYS_FILIO_H #include /* FIONREAD on Solaris 7 */ #endif @@ -82,9 +69,6 @@ #include -#include /* from the private lib dir */ -#include "getpart.h" - /***************************************************************************** * This is a rewrite/clone of the arpa/tftp.h file for systems without it. * *****************************************************************************/ @@ -119,7 +103,6 @@ struct tftphdr { #define TFTP_EBADID 5 #define TFTP_EEXISTS 6 #define TFTP_ENOUSER 7 -/****************************************************************************/ /***************************************************************************** * STRUCT DECLARATIONS AND DEFINES * diff --git a/tests/server/util.c b/tests/server/util.c index f21c3eaafd..8297c20270 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -21,102 +21,17 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "curl_setup.h" +#include "first.h" -#ifndef UNDER_CE -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef _XOPEN_SOURCE_EXTENDED -/* This define is "almost" required to build on HP-UX 11 */ -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif - -#include /* from the private lib dir */ - -/* adjust for old MSVC */ -#if defined(_MSC_VER) && (_MSC_VER < 1900) -# define snprintf _snprintf -#endif - -#ifdef _WIN32 -# define CURL_STRNICMP(p1, p2, n) _strnicmp(p1, p2, n) -#elif defined(HAVE_STRCASECMP) -# ifdef HAVE_STRINGS_H -# include -# endif -# define CURL_STRNICMP(p1, p2, n) strncasecmp(p1, p2, n) -#elif defined(HAVE_STRCMPI) -# define CURL_STRNICMP(p1, p2, n) strncmpi(p1, p2, n) -#elif defined(HAVE_STRICMP) -# define CURL_STRNICMP(p1, p2, n) strnicmp(p1, p2, n) -#else -# error "missing case insensitive comparison function" -#endif - -enum { - DOCNUMBER_NOTHING = -7, - DOCNUMBER_QUIT = -6, - DOCNUMBER_BADCONNECT = -5, - DOCNUMBER_INTERNAL = -4, - DOCNUMBER_CONNECT = -3, - DOCNUMBER_WERULEZ = -2, - DOCNUMBER_404 = -1 -}; - -#define SERVERLOGS_LOCKDIR "lock" /* within logdir */ - -#include "timeval.h" - -#include /* for curl_socket_t */ - -#ifdef USE_UNIX_SOCKETS -#ifdef HAVE_SYS_UN_H -#include /* for sockaddr_un */ -#endif -#endif /* USE_UNIX_SOCKETS */ - -typedef union { - struct sockaddr sa; - struct sockaddr_in sa4; -#ifdef USE_IPV6 - struct sockaddr_in6 sa6; +#ifdef HAVE_FCNTL_H +#include #endif -#ifdef USE_UNIX_SOCKETS - struct sockaddr_un sau; -#endif -} srvr_sockaddr_union_t; - -/* global variables */ -static const char *srcpath = "."; /* pointing to the test dir */ -static const char *pidname = NULL; -static const char *portname = NULL; /* none by default */ -static const char *serverlogfile = NULL; -static int serverlogslocked; -static const char *configfile = NULL; -static const char *logdir = "log"; -static char loglockfile[256]; -#ifdef USE_IPV6 -static bool use_ipv6 = FALSE; -#endif -static const char *ipv_inuse = "IPv4"; -static unsigned short server_port = 0; -static const char *socket_type = "IPv4"; -static int socket_domain = AF_INET; /* This function returns a pointer to STATIC memory. It converts the given * binary lump to a hex formatted string usable for output in logs or * whatever. */ -static char *data_to_hex(char *data, size_t len) +char *data_to_hex(char *data, size_t len) { static char buf[256*3]; size_t i; @@ -139,7 +54,26 @@ static char *data_to_hex(char *data, size_t len) return buf; } -static void logmsg(const char *msg, ...) +void loghex(unsigned char *buffer, ssize_t len) +{ + char data[12000]; + ssize_t i; + unsigned char *ptr = buffer; + char *optr = data; + ssize_t width = 0; + int left = sizeof(data); + + for(i = 0; i < len && (left >= 0); i++) { + snprintf(optr, left, "%02x", ptr[i]); + width += 2; + optr += 2; + left -= 2; + } + if(width) + logmsg("'%s'", data); +} + +void logmsg(const char *msg, ...) { va_list ap; char buffer[2048 + 1]; @@ -197,26 +131,7 @@ static void logmsg(const char *msg, ...) } } -static void loghex(unsigned char *buffer, ssize_t len) -{ - char data[12000]; - ssize_t i; - unsigned char *ptr = buffer; - char *optr = data; - ssize_t width = 0; - int left = sizeof(data); - - for(i = 0; i < len && (left >= 0); i++) { - snprintf(optr, left, "%02x", ptr[i]); - width += 2; - optr += 2; - left -= 2; - } - if(width) - logmsg("'%s'", data); -} - -static unsigned char byteval(char *value) +unsigned char byteval(char *value) { unsigned long num = strtoul(value, NULL, 10); return num & 0xff; @@ -244,7 +159,7 @@ static void win32_cleanup(void) _flushall(); } -static int win32_init(void) +int win32_init(void) { curlx_now_init(); #ifdef USE_WINSOCK @@ -276,7 +191,7 @@ static int win32_init(void) } /* socket-safe strerror (works on Winsock errors, too) */ -static const char *sstrerror(int err) +const char *sstrerror(int err) { static char buf[512]; return curlx_winapi_strerror(err, buf, sizeof(buf)); @@ -286,7 +201,7 @@ static const char *sstrerror(int err) #endif /* _WIN32 */ /* fopens the test case file */ -static FILE *test2fopen(long testno, const char *logdir2) +FILE *test2fopen(long testno, const char *logdir2) { FILE *stream; char filename[256]; @@ -309,7 +224,7 @@ static FILE *test2fopen(long testno, const char *logdir2) #define t_getpid() getpid() #endif -static curl_off_t our_getpid(void) +curl_off_t our_getpid(void) { curl_off_t pid = (curl_off_t)t_getpid(); #ifdef _WIN32 @@ -326,7 +241,7 @@ static curl_off_t our_getpid(void) return pid; } -static int write_pidfile(const char *filename) +int write_pidfile(const char *filename) { FILE *pidfile; curl_off_t pid; @@ -344,7 +259,7 @@ static int write_pidfile(const char *filename) } /* store the used port number in a file */ -static int write_portfile(const char *filename, int port) +int write_portfile(const char *filename, int port) { FILE *portfile = fopen(filename, "wb"); if(!portfile) { @@ -357,7 +272,7 @@ static int write_portfile(const char *filename, int port) return 1; /* success */ } -static void set_advisor_read_lock(const char *filename) +void set_advisor_read_lock(const char *filename) { FILE *lockfile; int error = 0; @@ -379,7 +294,7 @@ static void set_advisor_read_lock(const char *filename) filename, errno, strerror(errno)); } -static void clear_advisor_read_lock(const char *filename) +void clear_advisor_read_lock(const char *filename) { int error = 0; int res; @@ -440,18 +355,6 @@ static HANDLE thread_main_window = NULL; static HWND hidden_main_window = NULL; #endif -/* global variable which if set indicates that the program should finish */ -static volatile int got_exit_signal = 0; - -/* global variable which if set indicates the first signal handled in - exit_signal_handler */ -static volatile int exit_signal = 0; - -#ifdef _WIN32 -/* global event which if set indicates that the program should finish */ -static HANDLE exit_event = NULL; -#endif - /* signal handler that will be triggered to indicate that the program * should finish its execution in a controlled manner as soon as possible. * The first time this is called it will set got_exit_signal to one and @@ -665,7 +568,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler, } #endif -static void install_signal_handlers(bool keep_sigalrm) +void install_signal_handlers(bool keep_sigalrm) { #ifdef _WIN32 /* setup Windows exit event before any signal can trigger */ @@ -733,7 +636,7 @@ static void install_signal_handlers(bool keep_sigalrm) #endif } -static void restore_signal_handlers(bool keep_sigalrm) +void restore_signal_handlers(bool keep_sigalrm) { #ifdef SIGHUP if(SIG_ERR != old_sighup_handler) @@ -789,8 +692,8 @@ static void restore_signal_handlers(bool keep_sigalrm) #ifdef USE_UNIX_SOCKETS -static int bind_unix_socket(curl_socket_t sock, const char *unix_socket, - struct sockaddr_un *sau) +int bind_unix_socket(curl_socket_t sock, const char *unix_socket, + struct sockaddr_un *sau) { int error; int rc; @@ -860,7 +763,7 @@ static int bind_unix_socket(curl_socket_t sock, const char *unix_socket, #define CURL_MASK_USHORT ((unsigned short)~0) #define CURL_MASK_SSHORT (CURL_MASK_USHORT >> 1) -static unsigned short util_ultous(unsigned long ulnum) +unsigned short util_ultous(unsigned long ulnum) { #ifdef __INTEL_COMPILER # pragma warning(push) -- 2.47.2