From e1e4433f08ecc27c600606e150d5d4894dd9644e Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Sat, 17 Feb 2024 17:02:02 +0100 Subject: [PATCH] Expose ODBC test connector strings --- tests/odbc/CMakeLists.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/odbc/CMakeLists.txt b/tests/odbc/CMakeLists.txt index 3b6aa9fa4..282082b2f 100644 --- a/tests/odbc/CMakeLists.txt +++ b/tests/odbc/CMakeLists.txt @@ -10,9 +10,11 @@ if (WIN32) add_library(odbc_ms_access_tests OBJECT odbc_ms_access_tests.cpp) target_link_libraries(odbc_ms_access_tests PUBLIC soci_common_tests soci_odbc_interface) + set(SOCI_ODBC_TEST_ACCESS_CONNSTR "FILEDSN=${CMAKE_CURRENT_BINARY_DIR}/test-access.dsn" CACHE STRING "Connection string for the ODBC MS Access test") + soci_make_tests( OBJECT_LIB odbc_ms_access_tests - CONNECTION_STRING "FILEDSN=${CMAKE_CURRENT_BINARY_DIR}/test-access.dsn" + CONNECTION_STRING "${SOCI_ODBC_TEST_ACCESS_CONNSTR}" SHARED_NAME "soci_odbc_ms_access_test" STATIC_NAME "soci_odbc_ms_access_test_static" SOCI_DEP_ALIAS "ODBC" @@ -23,9 +25,11 @@ endif() add_library(odbc_mssql_tests OBJECT odbc_mssql_tests.cpp) target_link_libraries(odbc_mssql_tests PUBLIC soci_common_tests soci_odbc_interface) +set(SOCI_ODBC_TEST_MSSQL_CONNSTR "FILEDSN=${CMAKE_CURRENT_BINARY_DIR}/test-access.dsn" CACHE STRING "Connection string for the ODBC MSSQL test") + soci_make_tests( OBJECT_LIB odbc_mssql_tests - CONNECTION_STRING "FILEDSN=${CMAKE_CURRENT_BINARY_DIR}/test-access.dsn" + CONNECTION_STRING "${SOCI_ODBC_TEST_MSSQL_CONNSTR}" SHARED_NAME "soci_odbc_mssql_test" STATIC_NAME "soci_odbc_mssql_test_static" SOCI_DEP_ALIAS "ODBC" @@ -36,9 +40,11 @@ add_library(odbc_mysql_tests OBJECT odbc_mysql_tests.cpp) target_link_libraries(odbc_mysql_tests PUBLIC soci_common_tests soci_odbc_interface) target_include_directories(odbc_mysql_tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../") +set(SOCI_ODBC_TEST_MYSQL_CONNSTR "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/test-mysql.dsn" CACHE STRING "Connection string for the ODBC MySQL test") + soci_make_tests( OBJECT_LIB odbc_mysql_tests - CONNECTION_STRING "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/test-mysql.dsn" + CONNECTION_STRING "${SOCI_ODBC_TEST_MYSQL_CONNSTR}" SHARED_NAME "soci_odbc_mysql_test" STATIC_NAME "soci_odbc_mysql_test_static" SOCI_DEP_ALIAS "ODBC" @@ -54,9 +60,11 @@ endif() add_library(odbc_postgresql_tests OBJECT odbc_postgresql_tests.cpp) target_link_libraries(odbc_postgresql_tests PUBLIC soci_common_tests soci_odbc_interface) +set(SOCI_ODBC_TEST_POSTGRESQL_CONNSTR "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/${TEST_PGSQL_DSN}" CACHE STRING "Connection string for the ODBC PostgreSQL test") + soci_make_tests( OBJECT_LIB odbc_postgresql_tests - CONNECTION_STRING "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/${TEST_PGSQL_DSN}" + CONNECTION_STRING "${SOCI_ODBC_TEST_POSTGRESQL_CONNSTR}" SHARED_NAME "soci_odbc_postgresql_test" STATIC_NAME "soci_odbc_postgresql_test_static" SOCI_DEP_ALIAS "ODBC" @@ -70,9 +78,11 @@ if (WITH_ODBC_TEST_DB2) add_library(odbc_db2_tests OBJECT odbc_db2_tests.cpp) target_link_libraries(odbc_db2_tests PUBLIC soci_common_tests soci_odbc_interface) + set(SOCI_ODBC_TEST_DB2_CONNSTR "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/test-db2.dsn" CACHE STRING "Connection string for the ODBC DB2 test") + soci_make_tests( OBJECT_LIB odbc_db2_tests - CONNECTION_STRING "FILEDSN=${CMAKE_CURRENT_SOURCE_DIR}/test-db2.dsn" + CONNECTION_STRING "${SOCI_ODBC_TEST_DB2_CONNSTR}" SHARED_NAME "soci_odbc_db2_test" STATIC_NAME "soci_odbc_db2_test_static" SOCI_DEP_ALIAS "ODBC"