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

MXS-1196: Run Oracle test only when built against 10.3

Browse Source
This commit is contained in:
Johan Wikman
2017-05-24 17:15:16 +03:00
parent 3cf2db32d7
commit cc0c193d2e
1 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
query_classifier/test/CMakeLists.txt
View File

@ -1,5 +1,7 @@
# Include the embedded library headers # Include the embedded library headers
if (BUILD_QC_MYSQLEMBEDDED) if (BUILD_QC_MYSQLEMBEDDED)
find_package(MySQL)
subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR}) subdirs(MYSQL_INCLUDE_DIR_ALL ${MYSQL_EMBEDDED_INCLUDE_DIR})
foreach(DIR ${MYSQL_INCLUDE_DIR_ALL}) foreach(DIR ${MYSQL_INCLUDE_DIR_ALL})
include_directories(${DIR}) include_directories(${DIR})
@ -40,6 +42,7 @@ if (BUILD_QC_MYSQLEMBEDDED)
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; ")
if(NOT (MYSQL_EMBEDDED_VERSION VERSION_LESS 10.3))
add_test(TestQC_Oracle-binlog_stm_ps compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_ps.test) add_test(TestQC_Oracle-binlog_stm_ps compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_ps.test)
add_test(TestQC_Oracle-binlog_stm_sp compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_sp.test) add_test(TestQC_Oracle-binlog_stm_sp compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/binlog_stm_sp.test)
add_test(TestQC_Oracle-exception compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/exception.test) add_test(TestQC_Oracle-exception compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/exception.test)
@ -73,5 +76,6 @@ if (BUILD_QC_MYSQLEMBEDDED)
add_test(TestQC_Oracle-type_varchar2 compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar2.test) add_test(TestQC_Oracle-type_varchar2 compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/type_varchar2.test)
add_test(TestQC_Oracle-type_variables compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test) add_test(TestQC_Oracle-type_variables compare -C sql_mode=MODE_ORACLE -v 2 ${CMAKE_CURRENT_SOURCE_DIR}/oracle/variables.test)
endif() endif()
endif()
add_subdirectory(canonical_tests) add_subdirectory(canonical_tests)