MXS-1702: Move canonicalization test into core

Moved the test into the core where it belongs.

query_classifier/test/CMakeLists.txt

@@ -111,5 +111,3 @@ if (BUILD_QC_MYSQLEMBEDDED)
     add_test(TestQC_Oracle-type_variables    compare -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test)
   endif()
 endif()
-
-add_subdirectory(canonical_tests)

server/core/test/CMakeLists.txt

@@ -95,3 +95,4 @@ add_test(test_utils test_utils)
 add_test(test_session_track test_session_track)
 
 add_subdirectory(rest-api)
+add_subdirectory(canonical_tests)

server/core/test/canonical_tests/CMakeLists.txt

@@ -1,5 +1,4 @@
 # This test no longer requires the query classifier for canonicalization
-# TODO: Move these tests to the core test set
 add_executable(canonizer canonizer.c)
 target_link_libraries(canonizer maxscale-common)
 add_test(NAME CanonicalQuery COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh

server/core/test/canonical_tests/canonizer.c

@@ -41,7 +41,7 @@ int main(int argc, char** argv)
         return 1;
     }
 
-    set_libdir(strdup("../../qc_sqlite/"));
+    set_libdir(strdup("../../../../query_classifier/qc_sqlite/"));
     set_datadir(strdup("/tmp"));
     set_langdir(strdup("."));
     set_process_datadir(strdup("/tmp"));