Cleanups from NCBI as of May 2024

include/freetds/thread.h

@@ -331,7 +331,7 @@ static inline int tds_thread_is_current(tds_thread_id th)
 #  define tds_cond_init tds_raw_cond_init
 #  define tds_cond_destroy tds_raw_cond_destroy
 #  define tds_cond_signal tds_raw_cond_signal
-#  if !ENABLE_EXTRA_CHECKS
+#  if !ENABLE_EXTRA_CHECKS || !defined(TDS_HAVE_MUTEX)
 #    define TDS_MUTEX_INITIALIZER TDS_RAW_MUTEX_INITIALIZER
 #    define tds_mutex tds_raw_mutex
 #    define tds_mutex_lock tds_raw_mutex_lock

include/freetds/utils/test_base.h

@@ -0,0 +1,64 @@
+#ifndef _tdsguard_afBM6E9n8CuIFSBHNNblq5
+#define _tdsguard_afBM6E9n8CuIFSBHNNblq5
+
+/*
+ * Base header for FreeTDS unit tests, even those just covering helpers
+ * from the utils and replacements trees.  Should be included first
+ * (possibly via a common.h) to be certain of preceding <assert.h>.
+ */
+
+/* Ensure assert is always active. */
+#undef NDEBUG
+#ifdef assert
+#  error "Include test_base.h (or common.h) earlier"
+#endif
+
+#include <config.h>
+
+#include <freetds/bool.h>
+#include <freetds/macros.h>
+
+/*
+ * Tests should define test_main in lieu of main so that they can be
+ * configured to suppress automation-unfriendly crash dialog boxes on
+ * Windows.  To that end, they can use the TEST_MAIN macro, which cleanly
+ * avoids warnings for the tests that ignore their arguments (but still
+ * provides the details under conventional names for the remainder).
+ */
+int test_main(int argc, char **argv);
+
+#define TEST_MAIN() int test_main(int argc TDS_UNUSED, char **argv TDS_UNUSED)
+
+
+typedef struct
+{
+	char SERVER[512];
+	char DATABASE[512];
+	char USER[512];
+	char PASSWORD[512];
+	char DRIVER[1024]; /* ODBC-only */
+	char CHARSET[512];
+	int  maxlength;
+	bool fverbose;
+	bool initialized;
+	bool tried_env;
+} COMMON_PWD;
+
+extern COMMON_PWD common_pwd;
+
+#define DEFAULT_PWD_PATH "../../../PWD"
+
+void reset_login_info(COMMON_PWD * common_pwd);
+
+/*
+ * Both return the path used (favoring $TDSPWDFILE in the absence of
+ * tried_env) on success or NULL on failure (silently in the case of
+ * try_read_login_info), and defer to any existing settings from
+ * e.g. the command line.
+ */
+const char * read_login_info_base(COMMON_PWD * common_pwd,
+				  const char * default_path);
+const char * try_read_login_info_base(COMMON_PWD * common_pwd,
+				      const char * default_path);
+
+#endif /* _tdsguard_afBM6E9n8CuIFSBHNNblq5 */

src/apps/unittests/CMakeLists.txt

@@ -3,7 +3,8 @@ include_directories(..)
 foreach(target defncopy)
 	add_executable(a_${target} EXCLUDE_FROM_ALL ${target}.c)
 	set_target_properties(a_${target} PROPERTIES OUTPUT_NAME ${target})
-	target_link_libraries(a_${target} replacements tdsutils ${lib_NETWORK} ${lib_BASE})
+	target_link_libraries(a_${target} tds_test_base replacements tdsutils
+			      ${lib_NETWORK} ${lib_BASE})
 	add_test(NAME a_${target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND a_${target})
 	add_dependencies(check a_${target})
 endforeach(target)

src/apps/unittests/Makefile.am

@@ -8,6 +8,8 @@ check_PROGRAMS	=	$(TESTS)
 defncopy_SOURCES	=	defncopy.c
 
 AM_CPPFLAGS	=	-I$(top_srcdir)/include -I$(srcdir)/.. -I../ -DFREETDS_TOPDIR=\"$(top_srcdir)\"
-LDADD		=	../../replacements/libreplacements.la $(LTLIBICONV) $(NETWORK_LIBS)
+LDADD		=	../../utils/unittests/libtds_test_base.a \
+			../../replacements/libreplacements.la $(LTLIBICONV) \
+			$(NETWORK_LIBS)
 EXTRA_DIST	=	CMakeLists.txt
 

src/apps/unittests/defncopy.c

@@ -21,8 +21,7 @@
  * This tests execute some command using tsql and defncopy to check behaviour
  */
 
-#undef NDEBUG
-#include <config.h>
+#include <freetds/utils/test_base.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,49 +47,14 @@
 #include <freetds/bool.h>
 #include <freetds/macros.h>
 
-static char USER[512];
-static char SERVER[512];
-static char PASSWORD[512];
-static char DATABASE[512];
-
 /* content of output file, from command executed */
 static char *output;
 
 static bool
 read_login_info(void)
 {
-	FILE *in = NULL;
-	char line[512];
-	char *s1, *s2;
-
-	s1 = getenv("TDSPWDFILE");
-	if (s1 && s1[0])
-		in = fopen(s1, "r");
-	if (!in)
-		in = fopen("../../../PWD", "r");
-	if (!in) {
-		fprintf(stderr, "Can not open PWD file\n\n");
-		return false;
-	}
-
-	while (fgets(line, sizeof(line), in)) {
-		s1 = strtok(line, "=");
-		s2 = strtok(NULL, "\n");
-		if (!s1 || !s2) {
-			continue;
-		}
-		if (!strcmp(s1, "UID")) {
-			strcpy(USER, s2);
-		} else if (!strcmp(s1, "SRV")) {
-			strcpy(SERVER, s2);
-		} else if (!strcmp(s1, "PWD")) {
-			strcpy(PASSWORD, s2);
-		} else if (!strcmp(s1, "DB")) {
-			strcpy(DATABASE, s2);
-		}
-	}
-	fclose(in);
-	return true;
+	reset_login_info(&common_pwd);
+	return read_login_info_base(&common_pwd, DEFAULT_PWD_PATH) != NULL;
 }
 
 static void
@@ -212,14 +176,14 @@ static char *
 add_server(char *dest, char *const dest_end)
 {
 	dest = add_string(dest, dest_end, " -S ");
-	dest = quote_arg(dest, dest_end, SERVER);
+	dest = quote_arg(dest, dest_end, common_pwd.SERVER);
 	dest = add_string(dest, dest_end, " -U ");
-	dest = quote_arg(dest, dest_end, USER);
+	dest = quote_arg(dest, dest_end, common_pwd.USER);
 	dest = add_string(dest, dest_end, " -P ");
-	dest = quote_arg(dest, dest_end, PASSWORD);
-	if (DATABASE[0]) {
+	dest = quote_arg(dest, dest_end, common_pwd.PASSWORD);
+	if (common_pwd.DATABASE[0]) {
 		dest = add_string(dest, dest_end, " -D ");
-		dest = quote_arg(dest, dest_end, DATABASE);
+		dest = quote_arg(dest, dest_end, common_pwd.DATABASE);
 	}
 	return dest;
 }
@@ -413,7 +377,7 @@ test_weird_index_names(void)
 	tsql(clean);
 }
 
-int main(void)
+TEST_MAIN()
 {
 	FILE *f;
 

src/ctlib/unittests/CMakeLists.txt

@@ -14,9 +14,13 @@ foreach(target t0001 t0002 t0003 t0004
 	add_executable(c_${target} EXCLUDE_FROM_ALL ${target}.c)
 	set_target_properties(c_${target} PROPERTIES OUTPUT_NAME ${target})
 	if (target STREQUAL "all_types")
-		target_link_libraries(c_${target} c_common ct-static t_common tds replacements tdsutils ${lib_NETWORK} ${lib_BASE})
+		target_link_libraries(c_${target} c_common ct-static
+				      t_common tds_test_base tds replacements
+				      tdsutils ${lib_NETWORK} ${lib_BASE})
 	else()
-		target_link_libraries(c_${target} c_common ct replacements tdsutils ${lib_NETWORK} ${lib_BASE})
+		target_link_libraries(c_${target} c_common tds_test_base ct
+				      replacements tdsutils ${lib_NETWORK}
+				      ${lib_BASE})
 	endif()
 	add_test(NAME c_${target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND c_${target})
 	add_dependencies(check c_${target})

src/ctlib/unittests/Makefile.am

@@ -91,6 +91,8 @@ AM_LDFLAGS	=	-no-fast-install
 else
 AM_LDFLAGS	=	-no-install -L../.libs -R "$(abs_builddir)/../.libs"
 endif
-LDADD		=	libcommon.a ../libct.la ../../replacements/libreplacements.la $(LTLIBICONV)
+LDADD		=	libcommon.a ../../utils/unittests/libtds_test_base.a \
+			../libct.la ../../replacements/libreplacements.la \
+			$(LTLIBICONV)
 CLEANFILES	=	tdsdump.out
 EXTRA_DIST	=	CMakeLists.txt

src/ctlib/unittests/all_types.c

@@ -61,8 +61,7 @@ static void test_type(TDSSOCKET *tds TDS_UNUSED, TDSCOLUMN *col)
 	tds_free_results(bindinfo);
 }
 
-int
-main(void)
+TEST_MAIN()
 {
 	TDSCONTEXT *tds_ctx;
 	TDSSOCKET *tds;

src/ctlib/unittests/array_bind.c

@@ -1,8 +1,7 @@
 #include "common.h"
 
 /* Testing: array binding of result set */
-int
-main(void)
+TEST_MAIN()
 {
 	CS_CONTEXT *ctx;
 	CS_CONNECTION *conn;

src/ctlib/unittests/blk_in.c

@@ -184,8 +184,7 @@ do_bind(CS_BLKDESC * blkdesc, int colnum, CS_INT host_format, CS_INT host_type,
 }
 
 
-int
-main(void)
+TEST_MAIN()
 {
 	CS_CONTEXT *ctx;
 	CS_CONNECTION *conn;

src/ctlib/unittests/blk_in2.c

@@ -34,8 +34,7 @@ hoge_blkin(CS_CONNECTION * con, CS_BLKDESC * blk, char *table, char *data)
 	check_call(blk_done, (blk, CS_BLK_ALL, &row));
 }
 
-int
-main(void)
+TEST_MAIN()
 {
 	CS_CONTEXT *ctx;
 	CS_CONNECTION *conn;

src/ctlib/unittests/blk_out.c

@@ -3,8 +3,7 @@
 #include <bkpublic.h>
 
 /* Testing: array binding of result set */
-int
-main(void)
+TEST_MAIN()
 {
 	CS_CONTEXT *ctx;
 	CS_CONNECTION *conn;

src/ctlib/unittests/cancel.c

@@ -36,8 +36,7 @@ catch_alrm(int sig_num TDS_UNUSED)
 }
 
 /* Testing: Test asynchronous ct_cancel() */
-int
-main(void)
+TEST_MAIN()
 {
 	CS_CONTEXT *ctx;
 	CS_CONNECTION *conn;
@@ -190,8 +189,7 @@ do_fetch(CS_COMMAND * cmd, int *cnt)
 
 #else
 
-int
-main(void)
+TEST_MAIN()
 {
 	return 0;
 }