tests: move `curlcheck.h` to libtest as `unitcheck.h`

To simplify dependencies, and sync tunits and units builds further.

`curlcheck.h` already depended on logic implemented within libtests:
it referenced a global variable (`unitfail`) defined in `first.c` and
declared in `test.h`.

Also:
- rename to `unitcheck.h` to indicate it's meant for unit tests.
- make `unitcheck.h` include `first.h` instead of `test.h`.
  This brings header use closer to libtests. It also includes
  `curlx/curlx.h` for all unit tests by default now.
- move `unitfail` declaration from `test.h` to `first.h`.
  To match its definition in `first.c`.
- drop now redundant per-test curlx header includes.

Closes #17868

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 138e757eb5bb14bf34ab68d793e92a563e7a8aef..8d338ecaba00afa41c71d2b3a9acb073bb4d5f99 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -31,7 +31,7 @@ FIRST_H = first.h
 
 # Common files used by test programs
 UTILS_C = memptr.c testutil.c testtrace.c
-UTILS_H = test.h testutil.h testtrace.h
+UTILS_H = test.h testutil.h testtrace.h unitcheck.h
 
 CURLX_C = \
   ../../lib/curlx/warnless.c \

diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index 3a73d37094d18431d70557100602ec0fc2e65f39..aa8ae859785a7cffddfca6932019ff8f8d2841a7 100644 (file)
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -34,6 +34,8 @@ struct entry_s {
 
 extern const struct entry_s s_entries[];
 
+extern int unitfail; /* for unittests */
+
 #include <curlx/curlx.h>
 
 #endif /* HEADER_LIBTEST_FIRST_H */

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index 2c01794fe0ac37acdc052d29a47f7d048439319b..53c90913669ac593be69dead3eda1d0575645c24 100644 (file)
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -71,8 +71,6 @@ extern int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
 
 extern char *hexdump(const unsigned char *buffer, size_t len);
 
-extern int unitfail;
-
 /*
 ** TEST_ERR_* values must within the CURLcode range to not cause compiler
 ** errors.

diff --git a/tests/unit/curlcheck.h b/tests/libtest/unitcheck.h
similarity index 99%
rename from tests/unit/curlcheck.h
rename to tests/libtest/unitcheck.h
index 9f9b01f5f53e83d486166b289f39aec9e78477bb..8007f9f8b5cac4d28fecac8f729654288ed2148e 100644 (file)
--- a/tests/unit/curlcheck.h
+++ b/tests/libtest/unitcheck.h
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "test.h"
+#include "first.h"
 
 /* The fail macros mark the current test step as failed, and continue */
 #define fail_if(expr, msg)                                             \

diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index 2ef294f5138e284f58b1e95eb91b44bee2d7b652..e98b75aef1ca52e3ce1484b5311ec9c77e1114cd 100644 (file)
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -41,8 +41,7 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/src"            # for tool headers
-  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
-  "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"
+  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")

diff --git a/tests/tunit/Makefile.am b/tests/tunit/Makefile.am
index 7434469052ae178e0b23a74039a0ab3360928dae..14a5baaece6b69f534b3801b9d5a789ac674e66b 100644 (file)
--- a/tests/tunit/Makefile.am
+++ b/tests/tunit/Makefile.am
@@ -38,7 +38,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib            \
               -I$(top_srcdir)/src            \
               -I$(top_srcdir)/tests/libtest  \
-              -I$(top_srcdir)/tests/unit     \
               -I$(srcdir)
 
 # Get BUNDLE, FIRST_C, TESTS_C variables

diff --git a/tests/tunit/tool1394.c b/tests/tunit/tool1394.c
index eead5ea6a558f3f73697af2e164a459f1ae25bd7..5abb7ad52564a1726de9ddd5ee6ec2adb432b363 100644 (file)
--- a/tests/tunit/tool1394.c
+++ b/tests/tunit/tool1394.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_getparam.h"
 

diff --git a/tests/tunit/tool1604.c b/tests/tunit/tool1604.c
index 4d3101fd01585e2cf2fc7b83cd9b635a6a95157f..e50a074d96639f661d61487aaac8af5e23d50044 100644 (file)
--- a/tests/tunit/tool1604.c
+++ b/tests/tunit/tool1604.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_cfgable.h"
 #include "tool_doswin.h"

diff --git a/tests/tunit/tool1621.c b/tests/tunit/tool1621.c
index f14924e5f93c4d2a4bf63b4328c14155dbc282aa..4919988c6c87403d5ba60ad716ff6ef6ca7113ca 100644 (file)
--- a/tests/tunit/tool1621.c
+++ b/tests/tunit/tool1621.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_xattr.h"
 

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 879bfd29a522b12e0969f14715134d6a1ccaab8e..71bb680e78fa99b377fddd258eb14d2c7b1f5c28 100644 (file)
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# Get BUNDLE, FIRST_C, UTILS_H, TESTS_C variables
+# Get BUNDLE, FIRST_C, TESTS_C variables
 curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 
@@ -41,7 +41,7 @@ target_link_libraries(${BUNDLE} curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h", "unitprotos.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
-  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
+  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 00054ec2beef143cbcb39e5d8872236f3e7c74fe..eba0807441c05cebaf9dfc5331ac829e941be612 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -39,10 +39,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/tests/libtest  \
               -I$(srcdir)
 
-# Get BUNDLE, FIRST_C, UTILS_H, TESTS_C variables
+# Get BUNDLE, FIRST_C, TESTS_C variables
 include Makefile.inc
 
-EXTRA_DIST = CMakeLists.txt README.md $(UTILS_H) $(TESTS_C)
+EXTRA_DIST = CMakeLists.txt README.md $(TESTS_C)
 
 CFLAGS += @CURL_CFLAG_EXTRAS@
 

diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 17d257fb55ed9e77170246df014043eadd73b1da..f64a1630c8590e03b71e0964c82fada2f2dbca0a 100644 (file)
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -28,9 +28,6 @@ BUNDLE = units
 # Files referenced from the bundle source
 FIRST_C = ../libtest/first.c
 
-# Common files used by test programs
-UTILS_H = curlcheck.h
-
 # All unit test programs
 TESTS_C = \
   unit1300.c            unit1302.c unit1303.c unit1304.c unit1305.c \

diff --git a/tests/unit/README.md b/tests/unit/README.md
index aa545205efe7c9ee0c214bf08a33b21539357cad..99465a1ea08299e68e6e9783edfef3b4be6fe703 100644 (file)
--- a/tests/unit/README.md
+++ b/tests/unit/README.md
@@ -45,7 +45,7 @@ and the `tests/FILEFORMAT.md` documentation.
 
 For the actual C file, here's a simple example:
 ~~~c
-    #include "curlcheck.h"
+    #include "unitcheck.h"
 
     #include "a libcurl header.h" /* from the lib dir */
 
@@ -66,7 +66,7 @@ For the actual C file, here's a simple example:
 
 Here's an example using optional initialization and cleanup:
 ~~~c
-    #include "curlcheck.h"
+    #include "unitcheck.h"
 
     #include "a libcurl header.h" /* from the lib dir */
 

diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c
index bdc6b0162bfd1d8348e3b35ff21ae2cee17aefa5..41b0a3b63b50aa943dbddc217d84191d82dc7d37 100644 (file)
--- a/tests/unit/unit1300.c
+++ b/tests/unit/unit1300.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 #include "unitprotos.h"

diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index 1b1f4b44ba7101baa4920bceb4058a28c6f0ecf6..81a4614505257674e7e1c6ccb2926edefa3e0275 100644 (file)
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -21,11 +21,10 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "url.h" /* for Curl_safefree */
-#include <curlx/base64.h>
 #include "memdebug.h" /* LAST include file */
 
 struct etest {

diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index 415d574f0cab7d2b3b1be141119fa2b681e97f35..16334131d3f001574a258c7dd648fd65a6abf6e6 100644 (file)
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index 4c66170f4531933539f6688427b1acd48da31248..0d7f04f9deed0165cd2b63f6595f8dc51f250979 100644 (file)
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "netrc.h"
 #include "memdebug.h" /* LAST include file */
 

diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index 0ad1e00ee4a73dd50573d536e8b4f65d396d86e7..025b2321be912548a00233ac61d8e76e417b42b1 100644 (file)
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c
index 1b3dcd034394226258fba291b4734d228f70b03f..bd26ea07c448a4cee51c783690fac3dd3be01bc5 100644 (file)
--- a/tests/unit/unit1307.c
+++ b/tests/unit/unit1307.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_fnmatch.h"
 

diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c
index 5046305e7aea48ee9d9a218bacd5cbfc6e7354af..07b2cdfbfc9223e1d2fcf93ad3722606dcf0a49d 100644 (file)
--- a/tests/unit/unit1309.c
+++ b/tests/unit/unit1309.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "splay.h"
 

diff --git a/tests/unit/unit1323.c b/tests/unit/unit1323.c
index 4717559f2efb88dc4ebbfe5f7354fda36dc8305e..15417fa6d9f9639a2e5cf59e05c62950983c2b5b 100644 (file)
--- a/tests/unit/unit1323.c
+++ b/tests/unit/unit1323.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/timeval.h>
+#include "unitcheck.h"
 
 static CURLcode test_unit1323(char *arg)
 {

diff --git a/tests/unit/unit1330.c b/tests/unit/unit1330.c
index 2144e1c2169e9a186f9de26fe532a4fd83e9d688..9b0396028613b69b632b232f3c1dd41c1c565561 100644 (file)
--- a/tests/unit/unit1330.c
+++ b/tests/unit/unit1330.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "memdebug.h"
 

diff --git a/tests/unit/unit1395.c b/tests/unit/unit1395.c
index 7c09b3b78a87913516c7ae6221d24da62627b8ab..28cb1e83a14aceab668139740b21fa3905bc97e4 100644 (file)
--- a/tests/unit/unit1395.c
+++ b/tests/unit/unit1395.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "memdebug.h"
 #include "unitprotos.h"
 

diff --git a/tests/unit/unit1396.c b/tests/unit/unit1396.c
index 03d0a387990b6dcee9344de4a2f147329212348c..c56eaacace5a44a34f5b91064932c349c0dc72b8 100644 (file)
--- a/tests/unit/unit1396.c
+++ b/tests/unit/unit1396.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 static CURLcode t1396_setup(void)
 {

diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c
index 478b2a896212126bdf14635373ed5d9a90352471..5da11021a727951438f9753bd4260fcc566ab398 100644 (file)
--- a/tests/unit/unit1397.c
+++ b/tests/unit/unit1397.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/hostcheck.h"
 

diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c
index d3b54d3b73e07f5f8a7af92589224b0d7d81d69a..614bd91b37caa341b2248f68e9a641ee7c6623d2 100644 (file)
--- a/tests/unit/unit1398.c
+++ b/tests/unit/unit1398.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #if defined(CURL_GNUC_DIAG) || defined(__clang__)
 #pragma GCC diagnostic push

diff --git a/tests/unit/unit1399.c b/tests/unit/unit1399.c
index 7fba074f4f6fc797a1f8df50b1253a6f4c1c0924..9c3be1c4a6ff45cbc6711b77b1caaf71893017ff 100644 (file)
--- a/tests/unit/unit1399.c
+++ b/tests/unit/unit1399.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "progress.h"

diff --git a/tests/unit/unit1600.c b/tests/unit/unit1600.c
index de8431d998080327071531768271fe6c92863da1..748e2311495441b263846c3eedb59ea3f32de3ef 100644 (file)
--- a/tests/unit/unit1600.c
+++ b/tests/unit/unit1600.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "curl_ntlm_core.h"

diff --git a/tests/unit/unit1601.c b/tests/unit/unit1601.c
index 23a1ab21795f59ac67afd3f5e5705cfa75cf2549..c80622ba1326dc032d34500a32012721b7b71b8c 100644 (file)
--- a/tests/unit/unit1601.c
+++ b/tests/unit/unit1601.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md5.h"
 

diff --git a/tests/unit/unit1602.c b/tests/unit/unit1602.c
index 0bd2bbc5116ddb737cd0b6b4f26f88fa155b3dbd..996c7f9ae8a1a07c1abc268b1af8a82a622066d9 100644 (file)
--- a/tests/unit/unit1602.c
+++ b/tests/unit/unit1602.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 

diff --git a/tests/unit/unit1603.c b/tests/unit/unit1603.c
index 054b718999621b68aff08e6b1fb66a8b4bf04ae4..e19b3c2a51c79ae11e6eacf486882628ab588c49 100644 (file)
--- a/tests/unit/unit1603.c
+++ b/tests/unit/unit1603.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 

diff --git a/tests/unit/unit1605.c b/tests/unit/unit1605.c
index 0beeb0769f855b4b42369308a9a83250ffc41972..e3ea870dfda7ae6d74e5c35ba44a52458fd1c575 100644 (file)
--- a/tests/unit/unit1605.c
+++ b/tests/unit/unit1605.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 

diff --git a/tests/unit/unit1606.c b/tests/unit/unit1606.c
index 56748e8d8b2ab855c13a2dac33b76508a2a229bc..0a42db03965692e51a3152d74a609a67583eed26 100644 (file)
--- a/tests/unit/unit1606.c
+++ b/tests/unit/unit1606.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "speedcheck.h"
 #include "urldata.h"

diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c
index ba047361d329d6a950f245476576284b05fc6ee6..a9ba56e3251df910f9cab59c8015dc143126eefc 100644 (file)
--- a/tests/unit/unit1607.c
+++ b/tests/unit/unit1607.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

diff --git a/tests/unit/unit1608.c b/tests/unit/unit1608.c
index 6a395c1feeefbeacc92fe95335a5cbcd7c10012f..1c8ef3e961438394f5fcdfec459b5070cbf44a54 100644 (file)
--- a/tests/unit/unit1608.c
+++ b/tests/unit/unit1608.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hostip.h"
 

diff --git a/tests/unit/unit1609.c b/tests/unit/unit1609.c
index f8758f6acceaad88bea33a02a2bb8e931053f8d9..a6bf0e300257fe5e1999650da01509505662fbac 100644 (file)
--- a/tests/unit/unit1609.c
+++ b/tests/unit/unit1609.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

diff --git a/tests/unit/unit1610.c b/tests/unit/unit1610.c
index 954613d3adfc348146577d1049119d27a4ce4a44..2cded4df46e9821570903e9987b60a6a0f1e0742 100644 (file)
--- a/tests/unit/unit1610.c
+++ b/tests/unit/unit1610.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha256.h"
 

diff --git a/tests/unit/unit1611.c b/tests/unit/unit1611.c
index 496c86aad57bb93334f07394de79498363901d24..c39334bdd143b1bf42b8e76239325436f3e69719 100644 (file)
--- a/tests/unit/unit1611.c
+++ b/tests/unit/unit1611.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md4.h"
 

diff --git a/tests/unit/unit1612.c b/tests/unit/unit1612.c
index dc8f5dc14acfef025454f362ed37ef2f16ef6fbd..8faf67f85fba64bd772f78d30eda9f651f01da66 100644 (file)
--- a/tests/unit/unit1612.c
+++ b/tests/unit/unit1612.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_hmac.h"
 #include "curl_md5.h"

diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index 0b30fcd51241a85aeafab0b170b2e520dbe42dd9..a6ee3130c27bc8305d961399abceee89bbd0a3f5 100644 (file)
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "noproxy.h"
 

diff --git a/tests/unit/unit1615.c b/tests/unit/unit1615.c
index f1004c1e8d81eec3b32179f354721e4ed9b42ef8..48ea21981d119c297916e25eae634115c2fcf1f3 100644 (file)
--- a/tests/unit/unit1615.c
+++ b/tests/unit/unit1615.c
@@ -22,7 +22,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha512_256.h"
 

diff --git a/tests/unit/unit1616.c b/tests/unit/unit1616.c
index 5d03c274e7394fc82252843fa67c6d60a8afa7c6..10948e2efc1e956dd4b065803020d94f025bb4a4 100644 (file)
--- a/tests/unit/unit1616.c
+++ b/tests/unit/unit1616.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "uint-hash.h"
 

diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c
index 866ecb1baad576a8d6ae85c2051d9ee136733a63..8521f63b921a89c2f4b8bcef110a67b210d94f43 100644 (file)
--- a/tests/unit/unit1620.c
+++ b/tests/unit/unit1620.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "url.h"

diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c
index ad5dfa190050d8708ccca81a108c989a5ec4263d..b6807a5c5df6e769f5268eebc73f4ec88ff9c994 100644 (file)
--- a/tests/unit/unit1650.c
+++ b/tests/unit/unit1650.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "doh.h"
 

diff --git a/tests/unit/unit1651.c b/tests/unit/unit1651.c
index 19b84d4b013d533ff2ad3c478f59eafad6981025..aab5c37e8a303cbcd01d34b268e9b5da1c92a77f 100644 (file)
--- a/tests/unit/unit1651.c
+++ b/tests/unit/unit1651.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c
index f846731884804de718c406c712e0aebe7f1470dc..2d79390139d3987d05710d8b9e703dcec6ce2224 100644 (file)
--- a/tests/unit/unit1652.c
+++ b/tests/unit/unit1652.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "sendf.h"

diff --git a/tests/unit/unit1653.c b/tests/unit/unit1653.c
index 7b725f36ef06392afda61b7942253a0d5fdf930d..e203fd9f0043cd42c60b7ca368f69bb4152b05b8 100644 (file)
--- a/tests/unit/unit1653.c
+++ b/tests/unit/unit1653.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "curl/urlapi.h"

diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c
index 071fcbf9a17a355f03a9eab40a398a974d7f686b..bfed95997a34083b0f95537853e0676e1e44e8ca 100644 (file)
--- a/tests/unit/unit1654.c
+++ b/tests/unit/unit1654.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "altsvc.h"

diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c
index 369bea1c29d5464ff444b7d337dad2bedb5d1da6..c7037f113565af6cc8e52d579878aca952673e11 100644 (file)
--- a/tests/unit/unit1655.c
+++ b/tests/unit/unit1655.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "doh.h" /* from the lib dir */
 

diff --git a/tests/unit/unit1656.c b/tests/unit/unit1656.c
index 98e9e57e808f3692ad7fc17599d03a55f99abf66..7a41c8d0ee9bc43ec903200f2f8c608f28a88fa4 100644 (file)
--- a/tests/unit/unit1656.c
+++ b/tests/unit/unit1656.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

diff --git a/tests/unit/unit1657.c b/tests/unit/unit1657.c
index b5fb5398d419dfdc47cdcd7cd7f99251d3cace6d..efe5643435031d11ee641f93724622a3e714dc48 100644 (file)
--- a/tests/unit/unit1657.c
+++ b/tests/unit/unit1657.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

diff --git a/tests/unit/unit1658.c b/tests/unit/unit1658.c
index b572fbec3c24b5a3b6b281fc1f62c3b1be866650..ecd856b8b4f212650ee15f9d8fc46623ee67f091 100644 (file)
--- a/tests/unit/unit1658.c
+++ b/tests/unit/unit1658.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "doh.h" /* from the lib dir */
 

diff --git a/tests/unit/unit1660.c b/tests/unit/unit1660.c
index c47073a18f9d79ae4e42bf22702fd0d453f614e5..5889479721bdcb5e7137c2aa0ab82cb9b9635253 100644 (file)
--- a/tests/unit/unit1660.c
+++ b/tests/unit/unit1660.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "hsts.h"

diff --git a/tests/unit/unit1661.c b/tests/unit/unit1661.c
index 494f0b9e0919f2f8036f0d7ed567931361f1174c..3ae53629c2876ff32e01a7aa12dc0301dd055d43 100644 (file)
--- a/tests/unit/unit1661.c
+++ b/tests/unit/unit1661.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "bufref.h"
 #include "memdebug.h"
 

diff --git a/tests/unit/unit1663.c b/tests/unit/unit1663.c
index 52cbd7da22e1aa9d0c4dc0290731ab3b11efb99f..b017965380f940721a5c5d3bb3d54f7f0e7f489b 100644 (file)
--- a/tests/unit/unit1663.c
+++ b/tests/unit/unit1663.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/tests/unit/unit1664.c b/tests/unit/unit1664.c
index 49e00b3235b190c1d49e84a68e0ba6036ee712d6..d3e7670108d9639e7ef47b9f5627a631b397b1bc 100644 (file)
--- a/tests/unit/unit1664.c
+++ b/tests/unit/unit1664.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -30,8 +30,6 @@
 #include <netinet/in6.h>
 #endif
 
-#include <curlx/strparse.h>
-
 #include "memdebug.h" /* LAST include file */
 
 static CURLcode t1664_setup(void)

diff --git a/tests/unit/unit1979.c b/tests/unit/unit1979.c
index d670364a3a61cb9d7ca4f3b567cc59cd2a56c044..eb46f6561955c6090a51377a2022eba76958c086 100644 (file)
--- a/tests/unit/unit1979.c
+++ b/tests/unit/unit1979.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "http_aws_sigv4.h"
 

diff --git a/tests/unit/unit1980.c b/tests/unit/unit1980.c
index acb4b2f470006907e0600ad4ebf73cffbeb507f4..836b80ae52d17f1486f040264464352633cce09e 100644 (file)
--- a/tests/unit/unit1980.c
+++ b/tests/unit/unit1980.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "http_aws_sigv4.h"
 

diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index 063eed3536943b17f45ea6afc20ad1cfeb6ac1de..21e575258bf68e2227c543cf4e6f37d2dece550b 100644 (file)
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/curlx.h>
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/tests/unit/unit2601.c b/tests/unit/unit2601.c
index 7d7fdd777920f7cb4d88363f85679917c5ef1133..3dbd9b40fc4be2d0351523ecdcb463a8d3a55cf1 100644 (file)
--- a/tests/unit/unit2601.c
+++ b/tests/unit/unit2601.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "bufq.h"

diff --git a/tests/unit/unit2602.c b/tests/unit/unit2602.c
index 1834412e7365d2a8c79b61043ea4ee22a3e24251..2228d954f7b9edb7faa97a53c8838d046cb9d1ef 100644 (file)
--- a/tests/unit/unit2602.c
+++ b/tests/unit/unit2602.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "dynhds.h"

diff --git a/tests/unit/unit2603.c b/tests/unit/unit2603.c
index cfbe8eb305fe752aef0735bad32b96634e7b861d..060356eecf78f2e87eecb760fa4f023767eb5bb9 100644 (file)
--- a/tests/unit/unit2603.c
+++ b/tests/unit/unit2603.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "http.h"

diff --git a/tests/unit/unit2604.c b/tests/unit/unit2604.c
index 608a2ef0b7c8b981d06b5dca29bd2bb1be42fe59..23730e63c6781f25b90be9b7afb9645fcdd1bed6 100644 (file)
--- a/tests/unit/unit2604.c
+++ b/tests/unit/unit2604.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "vssh/curl_path.h"
 #include "memdebug.h"
 

diff --git a/tests/unit/unit3200.c b/tests/unit/unit3200.c
index 00c94811062e375001dfa8842e456f0ddc70959b..ff4e29e18fd3ff6ce816ee27675192e9461be0bf 100644 (file)
--- a/tests/unit/unit3200.c
+++ b/tests/unit/unit3200.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "curl_get_line.h"
 #include "memdebug.h"
 

diff --git a/tests/unit/unit3205.c b/tests/unit/unit3205.c
index 779938cc6fcb6d7c1e1a5fde9ce3e70edb33656f..535ff6298eb0fcb7d1d13f683ae182c7140625d9 100644 (file)
--- a/tests/unit/unit3205.c
+++ b/tests/unit/unit3205.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/cipher_suite.h"
 

diff --git a/tests/unit/unit3211.c b/tests/unit/unit3211.c
index 0cf6565fc92cd8f50e4bd2954f02431641f94aaa..efb58e95a3663c42635d39835cab6fde5beabf7d 100644 (file)
--- a/tests/unit/unit3211.c
+++ b/tests/unit/unit3211.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-bset.h"

diff --git a/tests/unit/unit3212.c b/tests/unit/unit3212.c
index 1226a6b6fa0c1b8daf6ef8741a3b4232b26bfe28..7386aad0e73a6603abc670938f3e669a4bc48378 100644 (file)
--- a/tests/unit/unit3212.c
+++ b/tests/unit/unit3212.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-table.h"

diff --git a/tests/unit/unit3213.c b/tests/unit/unit3213.c
index f59ad5a9cf1b085dea8a12260108616c7134f024..7ecdfb26642ee0921a2d506322ac1ab644da3ca8 100644 (file)
--- a/tests/unit/unit3213.c
+++ b/tests/unit/unit3213.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-spbset.h"

diff --git a/tests/unit/unit3214.c b/tests/unit/unit3214.c
index f1f88c078aa7f9d0f1344e3658f041047f309544..aff1292bb2c4da8bc028d9ea669e77efe933eb22 100644 (file)
--- a/tests/unit/unit3214.c
+++ b/tests/unit/unit3214.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"