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

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 \

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 */

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.

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)                                             \

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}")

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

tests/tunit/tool1394.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_getparam.h"
 

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"

tests/tunit/tool1621.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_xattr.h"
 

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}")

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@
 

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 \

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 */
 

tests/unit/unit1300.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 #include "unitprotos.h"

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 {

tests/unit/unit1303.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

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 */
 

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>

tests/unit/unit1307.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_fnmatch.h"
 

tests/unit/unit1309.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "splay.h"
 

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)
 {

tests/unit/unit1330.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "memdebug.h"
 

tests/unit/unit1395.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "memdebug.h"
 #include "unitprotos.h"
 

tests/unit/unit1396.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 static CURLcode t1396_setup(void)
 {

tests/unit/unit1397.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/hostcheck.h"
 

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

tests/unit/unit1399.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "progress.h"

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"

tests/unit/unit1601.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md5.h"
 

tests/unit/unit1602.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 

tests/unit/unit1603.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 

tests/unit/unit1605.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 

tests/unit/unit1606.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "speedcheck.h"
 #include "urldata.h"

tests/unit/unit1607.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

tests/unit/unit1608.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hostip.h"
 

tests/unit/unit1609.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"

tests/unit/unit1610.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha256.h"
 

tests/unit/unit1611.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md4.h"
 

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"

tests/unit/unit1614.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "noproxy.h"
 

tests/unit/unit1615.c

@@ -22,7 +22,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha512_256.h"
 

tests/unit/unit1616.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "uint-hash.h"
 

tests/unit/unit1620.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "url.h"

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"
 

tests/unit/unit1651.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

tests/unit/unit1652.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "sendf.h"

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"

tests/unit/unit1654.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "altsvc.h"

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 */
 

tests/unit/unit1656.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

tests/unit/unit1657.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 

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 */
 

tests/unit/unit1660.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "hsts.h"

tests/unit/unit1661.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "bufref.h"
 #include "memdebug.h"
 

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>

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)

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"
 

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"
 

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>

tests/unit/unit2601.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "bufq.h"

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"

tests/unit/unit2603.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "http.h"

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"
 

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"
 

tests/unit/unit3205.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/cipher_suite.h"
 

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"

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"

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"

tests/unit/unit3214.c

@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"