hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependency on embedded library

Browse Source 
The test programs of the query classifier do not need the
embedded library headers.
This commit is contained in:
Johan Wikman
2016-11-23 09:51:31 +02:00
parent 1457b88606
commit dcd98900ea
1 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
query_classifier/test/CMakeLists.txt
View File

@ -1,20 +1,5 @@
# Include the embedded library headers # Use the client libraries in MaxScale core
if (BUILD_QC_MYSQLEMBEDDED) include_directories(${MARIADB_CONNECTOR_INCLUDE_DIR})
subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR})
foreach(DIR ${MYSQL_INCLUDE_DIR_ALL})
include_directories(${DIR})
endforeach()
include_directories(${MYSQL_EMMBEDDED_INCLUDE_DIR}/..)
if(${ERRMSG} MATCHES "ERRMSG-NOTFOUND")
message(FATAL_ERROR "The errmsg.sys file was not found, please define the path with -DERRMSG=<path>")
else()
if(${CMAKE_VERSION} VERSION_LESS 2.8)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${ERRMSG} ${CMAKE_CURRENT_BINARY_DIR})
else()
file(COPY ${ERRMSG} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif()
endif()
add_executable(classify classify.c) add_executable(classify classify.c)
target_link_libraries(classify maxscale-common) target_link_libraries(classify maxscale-common)
@ -39,6 +24,5 @@ if (BUILD_QC_MYSQLEMBEDDED)
add_test(TestQC_CompareUpdate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/update.test) add_test(TestQC_CompareUpdate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/update.test)
add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test) add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test)
add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ") add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
endif()
add_subdirectory(canonical_tests) add_subdirectory(canonical_tests)