Remove dependency on embedded library
The test programs of the query classifier do not need the embedded library headers.
This commit is contained in:
@ -1,44 +1,28 @@
|
|||||||
# 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")
|
add_executable(classify classify.c)
|
||||||
message(FATAL_ERROR "The errmsg.sys file was not found, please define the path with -DERRMSG=<path>")
|
target_link_libraries(classify maxscale-common)
|
||||||
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(compare compare.cc)
|
||||||
target_link_libraries(classify maxscale-common)
|
target_link_libraries(compare maxscale-common)
|
||||||
|
|
||||||
add_executable(compare compare.cc)
|
add_executable(crash_qc_sqlite crash_qc_sqlite.c)
|
||||||
target_link_libraries(compare maxscale-common)
|
target_link_libraries(crash_qc_sqlite maxscale-common)
|
||||||
|
|
||||||
add_executable(crash_qc_sqlite crash_qc_sqlite.c)
|
add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
|
||||||
target_link_libraries(crash_qc_sqlite maxscale-common)
|
|
||||||
|
|
||||||
add_test(TestQC_Crash_qcsqlite crash_qc_sqlite)
|
add_test(TestQC_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
|
||||||
|
add_test(TestQC_SqLite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
|
||||||
|
|
||||||
add_test(TestQC_MySQLEmbedded classify qc_mysqlembedded ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
|
add_test(TestQC_CompareCreate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/create.test)
|
||||||
add_test(TestQC_SqLite classify qc_sqlite ${CMAKE_CURRENT_SOURCE_DIR}/input.sql ${CMAKE_CURRENT_SOURCE_DIR}/expected.sql)
|
add_test(TestQC_CompareDelete compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/delete.test)
|
||||||
|
add_test(TestQC_CompareInsert compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/insert.test)
|
||||||
add_test(TestQC_CompareCreate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/create.test)
|
add_test(TestQC_CompareJoin compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/join.test)
|
||||||
add_test(TestQC_CompareDelete compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/delete.test)
|
add_test(TestQC_CompareSelect compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/select.test)
|
||||||
add_test(TestQC_CompareInsert compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/insert.test)
|
add_test(TestQC_CompareSet compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/set.test)
|
||||||
add_test(TestQC_CompareJoin compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/join.test)
|
add_test(TestQC_CompareUpdate compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/update.test)
|
||||||
add_test(TestQC_CompareSelect compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/select.test)
|
add_test(TestQC_CompareMaxScale compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/maxscale.test)
|
||||||
add_test(TestQC_CompareSet compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/set.test)
|
add_test(TestQC_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
|
||||||
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_CompareWhiteSpace compare -v 2 -S -s "select user from mysql.user; ")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(canonical_tests)
|
add_subdirectory(canonical_tests)
|
||||||
|
Reference in New Issue
Block a user