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

Merge branch 'release-1.3.0' into develop

Browse Source
This commit is contained in:
Markus Makela
2016-01-08 11:14:02 +02:00
parent 2b83530ae9 36bd218afd
commit 40cfe1a864
46 changed files with 349 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
query_classifier/test/canonical_tests/CMakeLists.txt
View File

@ -8,7 +8,7 @@ else()
endif()
endif()
add_executable(canonizer canonizer.c ${CMAKE_SOURCE_DIR}/server/core/random_jkiss.c)
target_link_libraries(canonizer pthread query_classifier z dl ssl aio crypt crypto rt m ${EMBEDDED_LIB} fullcore stdc++)
target_link_libraries(canonizer ${PCRE2_LIBRARIES} utils pthread query_classifier z dl ssl aio crypt crypto rt m ${EMBEDDED_LIB} fullcore stdc++)
add_test(NAME Internal-TestCanonicalQuery COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh
${CMAKE_CURRENT_BINARY_DIR}/test.log
${CMAKE_CURRENT_SOURCE_DIR}/input.sql