From 5490954e43b1d06afe86889eeeca53cdf24bf3db Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 7 Nov 2014 18:47:41 +0200 Subject: [PATCH] Disabled login tests. --- server/modules/routing/CMakeLists.txt | 6 +++--- server/modules/routing/readwritesplit/test/CMakeLists.txt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt index 56e86bb96..b728b58c5 100644 --- a/server/modules/routing/CMakeLists.txt +++ b/server/modules/routing/CMakeLists.txt @@ -16,6 +16,6 @@ install(TARGETS cli DESTINATION modules) add_subdirectory(readwritesplit) -if(BUILD_TESTS) - add_subdirectory(test) -endif() +#if(BUILD_TESTS) +# add_subdirectory(test) +#endif() diff --git a/server/modules/routing/readwritesplit/test/CMakeLists.txt b/server/modules/routing/readwritesplit/test/CMakeLists.txt index 7a2a093d1..4dc4c0c5c 100644 --- a/server/modules/routing/readwritesplit/test/CMakeLists.txt +++ b/server/modules/routing/readwritesplit/test/CMakeLists.txt @@ -1,9 +1,9 @@ add_test(NAME ReadWriteSplitTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit.sh testrwsplit.log ${TEST_HOST} ${TEST_PORT_RW} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} ${CMAKE_CURRENT_SOURCE_DIR}) -find_library(MYSQLCLIENT_LIBARIES NAMES mysqlclient PATH_SUFFIXES mysql mariadb) -if( NOT (MYSQLCLIENT_LIBRARIES MATCHES "NOTFOUND")) - add_test(NAME ReadWriteSplitLoginTest COMMAND $ 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT_RW}) -endif() +#find_library(MYSQLCLIENT_LIBARIES NAMES mysqlclient PATH_SUFFIXES mysql mariadb) +#if( NOT (MYSQLCLIENT_LIBRARIES MATCHES "NOTFOUND")) +# add_test(NAME ReadWriteSplitLoginTest COMMAND $ 10000 ${TEST_HOST} ${MASTER_PORT} ${TEST_HOST} ${TEST_PORT_RW} 1.10) +#endif() add_subdirectory(test_hints) \ No newline at end of file