port test.. will it work ??

FreeTDS · Dec 14, 2024 · bc84e59 · bc84e59
1 parent 008d0d1
commit bc84e59
Show file tree

Hide file tree

Showing 9 changed files with 495 additions and 19 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,10 +1,5 @@
-SUBDIRS	     = utils replacements tds ctlib dblib
-DIST_SUBDIRS = utils replacements tds ctlib dblib \
-	odbc server pool apps
-
-if ODBC
-SUBDIRS	+= odbc
-endif
+SUBDIRS	     = utils replacements tds
+DIST_SUBDIRS = utils replacements tds server pool ctlib dblib odbc apps
 
 if INCPOOL
 SUBDIRS += server pool
@@ -14,6 +9,12 @@ SUBDIRS += server
 endif
 endif
 
+SUBDIRS	+= ctlib dblib
+
+if ODBC
+SUBDIRS	+= odbc
+endif
+
 if INCAPPS
 SUBDIRS += apps
 endif
diff --git a/src/odbc/unittests/.gitignore b/src/odbc/unittests/.gitignore
@@ -87,3 +87,4 @@
 /qn
 /connection_string_parse
 /tvp
+/tokens
diff --git a/src/odbc/unittests/CMakeLists.txt b/src/odbc/unittests/CMakeLists.txt
@@ -30,7 +30,7 @@ set(tests
 	all_types utf8_3 empty_query
 	transaction3 transaction4
 	utf8_4 qn connection_string_parse
-	tvp
+	tvp tokens
 )
 
 if(WIN32)

diff --git a/src/odbc/unittests/Makefile.am b/src/odbc/unittests/Makefile.am
@@ -83,6 +83,7 @@ TESTS =	\
 	qn$(EXEEXT) \
 	connection_string_parse$(EXEEXT) \
 	tvp$(EXEEXT) \
+	tokens$(EXEEXT) \
 	$(NULL)
 
 check_PROGRAMS	=	$(TESTS) oldpwd$(EXEEXT)
@@ -180,6 +181,8 @@ qn_SOURCES = qn.c
 connection_string_parse_SOURCES = connection_string_parse.c
 connection_string_parse_CPPFLAGS = $(GLOBAL_CPPFLAGS)
 connection_string_parse_LDFLAGS = -static ../libtdsodbc.la ../../tds/unittests/libcommon.a -shared $(GLOBAL_LD_ADD)
+tokens_SOURCES	= tokens.c
+tokens_LDADD = libcommon.a $(ODBC_LDFLAGS) ../../replacements/libreplacements.la ../../server/libtdssrv.la $(GLOBAL_LD_ADD)
 
 noinst_LIBRARIES = libcommon.a
 libcommon_a_SOURCES = common.c common.h c2string.c parser.c parser.h \
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,3 +87,4 @@ @@
     /qn
     /connection_string_parse
     /tvp
+    /tokens