Bug#23151414 - MOVE X PLUGIN TESTS TO RAPID/PLUGIN/X/TEST

Description:
X Plugin is located in optional directory, still its tests are located
in mysql-test/suite/xplugin. This suite should also be optional.

Solution:
Test suite was moved to rapid/plugin/x/tests/mtr/*. Right now X Plugin
needs to call INSTALL command in CMakeFile.txt (simillar like internal
plugins do) for its suite.

RB: 12602
Reviewed-by: Bjorn Munch <[email protected]>
Reviewed-by: Sayantan Dutta <[email protected]>
Reviewed-by: Andrzej Religa <[email protected]>

Author: lkotula

mysql-test/include/plugin.defs

@@ -59,7 +59,6 @@ test_udf_services  plugin/udf_services TESTUDFSERVICES
 group_replication  plugin/group_replication   GROUP_REPLICATION
 locking_service    sql                        LOCKING_SERVICE
 version_token      plugin/version_token       VERSION_TOKEN
-mysqlx             plugin/x                   MYSQLXPLUGIN
 # Test services framework
 libtest_services   plugin/test_services TESTSERVICES
 libtest_services_threaded  plugin/test_services TESTSERVICESTHREADED

mysql-test/lib/mtr_cases.pm

@@ -296,6 +296,8 @@ sub collect_one_suite($)
 			      # Look in plugin specific suite dir
 			      "plugin/$suite/tests",
 			      "internal/plugin/$suite/tests",
+			      "rapid/plugin/$suite/tests",
+			      "rapid/mysql-test/suite",
 			     ],
 			     [$suite, "mtr"], ($suite =~ /^i_/));
       return unless $suitedir;

mysql-test/mysql-test-run.pl

@@ -164,7 +164,7 @@ END
 
 # If you add a new suite, please check TEST_DIRS in Makefile.am.
 #
-my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,gis,rpl,innodb,innodb_gis,innodb_fts,innodb_zip,innodb_undo,perfschema,funcs_1,opt_trace,parts,auth_sec,query_rewrite_plugins,gcol,sysschema,test_service_sql_api,xplugin";
+my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,gis,rpl,innodb,innodb_gis,innodb_fts,innodb_zip,innodb_undo,perfschema,funcs_1,opt_trace,parts,auth_sec,query_rewrite_plugins,gcol,sysschema,test_service_sql_api";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
@@ -259,6 +259,8 @@ END
 
 my $baseport;
 my $mysqlx_baseport;
+
+my $opt_mysqlx_baseport = $ENV{'MYSQLXPLUGIN_PORT'} || "auto";
 # $opt_build_thread may later be set from $opt_port_base
 my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto";
 my $opt_port_base= $ENV{'MTR_PORT_BASE'} || "auto";
@@ -432,8 +434,9 @@ sub main {
   }
   $ENV{MTR_PARALLEL} = $opt_parallel;
 
-  if ($opt_parallel > 1 && ($opt_start_exit || $opt_stress)) {
-    mtr_warning("Parallel cannot be used with --start-and-exit or --stress\n" .
+  my $is_option_mysqlx_port_set= $opt_mysqlx_baseport ne "auto";
+  if ($opt_parallel > 1 && ($opt_start_exit || $opt_stress || $is_option_mysqlx_port_set)) {
+    mtr_warning("Parallel cannot be used neither with --start-and-exit nor --stress nor --mysqlx_port\n" .
                "Setting parallel to 1");
     $opt_parallel= 1;
   }
@@ -465,6 +468,7 @@ sub main {
   # Also read from any plugin local or suite specific plugin.defs
   for (glob "$basedir/plugin/*/tests/mtr/plugin.defs".
             " $basedir/internal/plugin/*/tests/mtr/plugin.defs".
+            " $basedir/rapid/plugin/*/tests/mtr/plugin.defs".
             " suite/*/plugin.defs") {
     read_plugin_defs($_);
   }
@@ -1116,8 +1120,9 @@ sub command_line_setup {
 	     'skip-im'                  => \&ignore_option,
 
              # Specify ports
-	     'build-thread|mtr-build-thread=i' => \$opt_build_thread,
-	     'port-base|mtr-port-base=i'       => \$opt_port_base,
+             'build-thread|mtr-build-thread=i' => \$opt_build_thread,
+             'mysqlx-port=i'                   => \$opt_mysqlx_baseport,
+             'port-base|mtr-port-base=i'       => \$opt_port_base,
 
              # Test case authoring
              'record'                   => \$opt_record,
@@ -1830,7 +1835,6 @@ sub command_line_setup {
   check_debug_support(\%mysqld_variables);
 
   executable_setup();
-
 }
 
 
@@ -1881,8 +1885,12 @@ ($)
 
   # Calculate baseport
   $baseport= $build_thread * 10 + 10000;
-  $mysqlx_baseport =  $baseport + 9;
-  if ( $baseport < 5001 or $mysqlx_baseport + 9 >= 32767 )
+
+  my $should_generate_value= $opt_mysqlx_baseport eq "auto";
+
+  $mysqlx_baseport= $should_generate_value ? $baseport + 9 : $opt_mysqlx_baseport;
+  
+  if ( $baseport < 5001 or $baseport + 9 >= 32767)
   {
     mtr_error("MTR_BUILD_THREAD number results in a port",
               "outside 5001 - 32767",

mysql-test/suite/xplugin/t/256kb.json renamed to mysql-test/std_data/256kb.json

@@ -217,4 +217,19 @@ ELSE()
     ADD_DEFINITIONS(-DMYSQLXTEST_EXPORTS)
   ENDIF()
 
+  IF(INSTALL_MYSQLTESTDIR)
+    INSTALL(
+      FILES tests/mtr/plugin.defs
+      DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/x"
+      COMPONENT Test
+    )
+    INSTALL(
+      DIRECTORY tests/mtr/t tests/mtr/r tests/mtr/include
+      DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/x"
+      USE_SOURCE_PERMISSIONS
+      COMPONENT Test
+      PATTERN "collections" EXCLUDE
+    )
+  ENDIF()
 ENDIF()
+

rapid/plugin/x/CMakeLists.txt

@@ -97,7 +97,7 @@ static std::list<Stack_frame> script_stack;
 static std::map<std::string, std::string> variables;
 static std::list<std::string> variables_to_unreplace;
 
-void replace_all(std::string &input, const std::string &to_find, const std::string &change_to)
+static void replace_all(std::string &input, const std::string &to_find, const std::string &change_to)
 {
   size_t position = input.find(to_find);
 
@@ -108,7 +108,7 @@ void replace_all(std::string &input, const std::string &to_find, const std::stri
   }
 }
 
-void replace_variables(std::string &s)
+static void replace_variables(std::string &s)
 {
   for (std::map<std::string, std::string>::const_iterator sub = variables.begin();
       sub != variables.end(); ++sub)
@@ -123,7 +123,7 @@ void replace_variables(std::string &s)
   }
 }
 
-std::string unreplace_variables(const std::string &in, bool clear)
+static std::string unreplace_variables(const std::string &in, bool clear)
 {
   std::string s = in;
   for (std::list<std::string>::const_iterator sub = variables_to_unreplace.begin();
@@ -1765,10 +1765,13 @@ class Command
       return Stop_with_failure;
     }
 
-    std::ifstream file(argl[1].c_str());
+    std::string path_to_file = argl[1];
+    replace_variables(path_to_file);
+
+    std::ifstream file(path_to_file.c_str());
     if (!file.is_open())
     {
-      std::cerr << "Coult not open file " << argl[1]<<"\n";
+      std::cerr << "Couldn't not open file " << path_to_file <<"\n";
       return Stop_with_failure;
     }
 
@@ -2914,7 +2917,7 @@ class My_command_line_options : public Command_line_options
   }
 };
 
-std::vector<Block_processor_ptr> create_macro_block_processors(Connection_manager *cm)
+static std::vector<Block_processor_ptr> create_macro_block_processors(Connection_manager *cm)
 {
   std::vector<Block_processor_ptr> result;
 
@@ -2926,7 +2929,7 @@ std::vector<Block_processor_ptr> create_macro_block_processors(Connection_manage
   return result;
 }
 
-std::vector<Block_processor_ptr> create_block_processors(Connection_manager *cm)
+static std::vector<Block_processor_ptr> create_block_processors(Connection_manager *cm)
 {
   std::vector<Block_processor_ptr> result;
 
@@ -3058,14 +3061,14 @@ static std::istream &get_input(My_command_line_options &opt, std::ifstream &file
 }
 
 
-inline void unable_daemonize()
+static void unable_daemonize()
 {
   std::cerr << "ERROR: Unable to put process in background\n";
   exit(2);
 }
 
 
-void daemonize()
+static void daemonize()
 {
 #ifdef WIN32
   unable_daemonize();

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

@@ -0,0 +1 @@
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental

rapid/plugin/x/tests/collections/default.daily

@@ -0,0 +1 @@
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental

rapid/plugin/x/tests/collections/default.daily-valgrind

@@ -0,0 +1,4 @@
+# For easier human reading (MTR doesn't care), please keep entries
+# in alphabetical order. This also helps with merge conflict resolution.
+
+

rapid/plugin/x/tests/collections/default.experimental

@@ -0,0 +1 @@
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental