From f1325549e9eca1311435255854da0a93923eff9b Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 31 Oct 2013 11:53:00 +0400 Subject: [PATCH] - Adding cmake code to install ConnectSE mtr tests - Including "connect" suite into the list of the default suites --- mysql-test/mysql-test-run.pl | 2 +- storage/connect/CMakeLists.txt | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a7a53166563..7b29ef2cb9d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -166,6 +166,7 @@ my $DEFAULT_SUITES= join(',', map { "$_-" } qw( main archive binlog + connect csv federated funcs_1 @@ -379,7 +380,6 @@ sub main { mtr_report("Logging: $0 ", join(" ", @ARGV)); $DEFAULT_SUITES.= ',' . join(',', qw( - connect query_response_time sequence spider diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 327f0035e06..dedcec792a5 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -264,6 +264,19 @@ int main() { ENDIF(UNIX) ENDIF(CONNECT_WITH_ODBC) +# +# Installing tests +# +IF(INSTALL_MYSQLTESTDIR) +INSTALL( + DIRECTORY mysql-test/connect + DESTINATION ${INSTALL_MYSQLTESTDIR}/suite + USE_SOURCE_PERMISSIONS + COMPONENT Test + PATTERN "*~" EXCLUDE +) +ENDIF() + # # Plugin definition