From 78f684e552fbdf7fc82c666035a0b8d66144a15a Mon Sep 17 00:00:00 2001 From: Monty Date: Sat, 22 Apr 2023 17:23:52 +0300 Subject: [PATCH] Moved events tests from main to suite/events This makes it easier to run test on just events. --- mysql-test/main/disabled.def | 1 - mysql-test/mariadb-test-run.pl | 3 ++- mysql-test/suite/events/disabled.def | 12 ++++++++++++ mysql-test/{main => suite/events}/events_1.result | 0 mysql-test/{main => suite/events}/events_1.test | 0 mysql-test/{main => suite/events}/events_2.result | 0 mysql-test/{main => suite/events}/events_2.test | 0 .../{main => suite/events}/events_bugs-master.opt | 0 mysql-test/{main => suite/events}/events_bugs.result | 0 mysql-test/{main => suite/events}/events_bugs.test | 0 .../{main => suite/events}/events_embedded.result | 0 .../{main => suite/events}/events_embedded.test | 0 .../{main => suite/events}/events_grant.result | 0 mysql-test/{main => suite/events}/events_grant.test | 0 .../events}/events_logs_tests-master.opt | 0 .../{main => suite/events}/events_logs_tests.result | 0 .../{main => suite/events}/events_logs_tests.test | 0 .../{main => suite/events}/events_microsec.result | 0 .../{main => suite/events}/events_microsec.test | 0 .../{main => suite/events}/events_restart-master.opt | 0 .../{main => suite/events}/events_restart.result | 0 .../{main => suite/events}/events_restart.test | 0 .../{main => suite/events}/events_scheduling.result | 0 .../{main => suite/events}/events_scheduling.test | 0 .../{main => suite/events}/events_slowlog.result | 0 .../{main => suite/events}/events_slowlog.test | 0 .../{main => suite/events}/events_stress.result | 0 mysql-test/{main => suite/events}/events_stress.test | 0 .../{main => suite/events}/events_time_zone.result | 0 .../{main => suite/events}/events_time_zone.test | 0 .../{main => suite/events}/events_trans.result | 0 mysql-test/{main => suite/events}/events_trans.test | 0 .../events}/events_trans_notembedded.result | 0 .../events}/events_trans_notembedded.test | 0 34 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 mysql-test/suite/events/disabled.def rename mysql-test/{main => suite/events}/events_1.result (100%) rename mysql-test/{main => suite/events}/events_1.test (100%) rename mysql-test/{main => suite/events}/events_2.result (100%) rename mysql-test/{main => suite/events}/events_2.test (100%) rename mysql-test/{main => suite/events}/events_bugs-master.opt (100%) rename mysql-test/{main => suite/events}/events_bugs.result (100%) rename mysql-test/{main => suite/events}/events_bugs.test (100%) rename mysql-test/{main => suite/events}/events_embedded.result (100%) rename mysql-test/{main => suite/events}/events_embedded.test (100%) rename mysql-test/{main => suite/events}/events_grant.result (100%) rename mysql-test/{main => suite/events}/events_grant.test (100%) rename mysql-test/{main => suite/events}/events_logs_tests-master.opt (100%) rename mysql-test/{main => suite/events}/events_logs_tests.result (100%) rename mysql-test/{main => suite/events}/events_logs_tests.test (100%) rename mysql-test/{main => suite/events}/events_microsec.result (100%) rename mysql-test/{main => suite/events}/events_microsec.test (100%) rename mysql-test/{main => suite/events}/events_restart-master.opt (100%) rename mysql-test/{main => suite/events}/events_restart.result (100%) rename mysql-test/{main => suite/events}/events_restart.test (100%) rename mysql-test/{main => suite/events}/events_scheduling.result (100%) rename mysql-test/{main => suite/events}/events_scheduling.test (100%) rename mysql-test/{main => suite/events}/events_slowlog.result (100%) rename mysql-test/{main => suite/events}/events_slowlog.test (100%) rename mysql-test/{main => suite/events}/events_stress.result (100%) rename mysql-test/{main => suite/events}/events_stress.test (100%) rename mysql-test/{main => suite/events}/events_time_zone.result (100%) rename mysql-test/{main => suite/events}/events_time_zone.test (100%) rename mysql-test/{main => suite/events}/events_trans.result (100%) rename mysql-test/{main => suite/events}/events_trans.test (100%) rename mysql-test/{main => suite/events}/events_trans_notembedded.result (100%) rename mysql-test/{main => suite/events}/events_trans_notembedded.test (100%) diff --git a/mysql-test/main/disabled.def b/mysql-test/main/disabled.def index 02104f6a680..7d0c59e1c84 100644 --- a/mysql-test/main/disabled.def +++ b/mysql-test/main/disabled.def @@ -10,7 +10,6 @@ # ############################################################################## tablespace : disabled in MariaDB (no TABLESPACE table attribute) -events_time_zone : Test is not predictable as it depends on precise timing. read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 #show_explain : Psergey: random timeout in range-checked-for-each record query. diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 0c97866bd67..07d55afe959 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -186,6 +186,7 @@ my @DEFAULT_SUITES= qw( compat/mssql- compat/maxdb- encryption- + events- federated- funcs_1- funcs_2- @@ -5961,7 +5962,7 @@ Misc options phases of test execution. stress=ARGS Run stress test, providing options to mysql-stress-test.pl. Options are separated by comma. - xml-report= Output jUnit xml file of the results. + xml-report= Output xml file of the results. tail-lines=N Number of lines of the result to include in a failure report. diff --git a/mysql-test/suite/events/disabled.def b/mysql-test/suite/events/disabled.def new file mode 100644 index 00000000000..d895d7d221e --- /dev/null +++ b/mysql-test/suite/events/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +events_time_zone : Test is not predictable as it depends on precise timing. diff --git a/mysql-test/main/events_1.result b/mysql-test/suite/events/events_1.result similarity index 100% rename from mysql-test/main/events_1.result rename to mysql-test/suite/events/events_1.result diff --git a/mysql-test/main/events_1.test b/mysql-test/suite/events/events_1.test similarity index 100% rename from mysql-test/main/events_1.test rename to mysql-test/suite/events/events_1.test diff --git a/mysql-test/main/events_2.result b/mysql-test/suite/events/events_2.result similarity index 100% rename from mysql-test/main/events_2.result rename to mysql-test/suite/events/events_2.result diff --git a/mysql-test/main/events_2.test b/mysql-test/suite/events/events_2.test similarity index 100% rename from mysql-test/main/events_2.test rename to mysql-test/suite/events/events_2.test diff --git a/mysql-test/main/events_bugs-master.opt b/mysql-test/suite/events/events_bugs-master.opt similarity index 100% rename from mysql-test/main/events_bugs-master.opt rename to mysql-test/suite/events/events_bugs-master.opt diff --git a/mysql-test/main/events_bugs.result b/mysql-test/suite/events/events_bugs.result similarity index 100% rename from mysql-test/main/events_bugs.result rename to mysql-test/suite/events/events_bugs.result diff --git a/mysql-test/main/events_bugs.test b/mysql-test/suite/events/events_bugs.test similarity index 100% rename from mysql-test/main/events_bugs.test rename to mysql-test/suite/events/events_bugs.test diff --git a/mysql-test/main/events_embedded.result b/mysql-test/suite/events/events_embedded.result similarity index 100% rename from mysql-test/main/events_embedded.result rename to mysql-test/suite/events/events_embedded.result diff --git a/mysql-test/main/events_embedded.test b/mysql-test/suite/events/events_embedded.test similarity index 100% rename from mysql-test/main/events_embedded.test rename to mysql-test/suite/events/events_embedded.test diff --git a/mysql-test/main/events_grant.result b/mysql-test/suite/events/events_grant.result similarity index 100% rename from mysql-test/main/events_grant.result rename to mysql-test/suite/events/events_grant.result diff --git a/mysql-test/main/events_grant.test b/mysql-test/suite/events/events_grant.test similarity index 100% rename from mysql-test/main/events_grant.test rename to mysql-test/suite/events/events_grant.test diff --git a/mysql-test/main/events_logs_tests-master.opt b/mysql-test/suite/events/events_logs_tests-master.opt similarity index 100% rename from mysql-test/main/events_logs_tests-master.opt rename to mysql-test/suite/events/events_logs_tests-master.opt diff --git a/mysql-test/main/events_logs_tests.result b/mysql-test/suite/events/events_logs_tests.result similarity index 100% rename from mysql-test/main/events_logs_tests.result rename to mysql-test/suite/events/events_logs_tests.result diff --git a/mysql-test/main/events_logs_tests.test b/mysql-test/suite/events/events_logs_tests.test similarity index 100% rename from mysql-test/main/events_logs_tests.test rename to mysql-test/suite/events/events_logs_tests.test diff --git a/mysql-test/main/events_microsec.result b/mysql-test/suite/events/events_microsec.result similarity index 100% rename from mysql-test/main/events_microsec.result rename to mysql-test/suite/events/events_microsec.result diff --git a/mysql-test/main/events_microsec.test b/mysql-test/suite/events/events_microsec.test similarity index 100% rename from mysql-test/main/events_microsec.test rename to mysql-test/suite/events/events_microsec.test diff --git a/mysql-test/main/events_restart-master.opt b/mysql-test/suite/events/events_restart-master.opt similarity index 100% rename from mysql-test/main/events_restart-master.opt rename to mysql-test/suite/events/events_restart-master.opt diff --git a/mysql-test/main/events_restart.result b/mysql-test/suite/events/events_restart.result similarity index 100% rename from mysql-test/main/events_restart.result rename to mysql-test/suite/events/events_restart.result diff --git a/mysql-test/main/events_restart.test b/mysql-test/suite/events/events_restart.test similarity index 100% rename from mysql-test/main/events_restart.test rename to mysql-test/suite/events/events_restart.test diff --git a/mysql-test/main/events_scheduling.result b/mysql-test/suite/events/events_scheduling.result similarity index 100% rename from mysql-test/main/events_scheduling.result rename to mysql-test/suite/events/events_scheduling.result diff --git a/mysql-test/main/events_scheduling.test b/mysql-test/suite/events/events_scheduling.test similarity index 100% rename from mysql-test/main/events_scheduling.test rename to mysql-test/suite/events/events_scheduling.test diff --git a/mysql-test/main/events_slowlog.result b/mysql-test/suite/events/events_slowlog.result similarity index 100% rename from mysql-test/main/events_slowlog.result rename to mysql-test/suite/events/events_slowlog.result diff --git a/mysql-test/main/events_slowlog.test b/mysql-test/suite/events/events_slowlog.test similarity index 100% rename from mysql-test/main/events_slowlog.test rename to mysql-test/suite/events/events_slowlog.test diff --git a/mysql-test/main/events_stress.result b/mysql-test/suite/events/events_stress.result similarity index 100% rename from mysql-test/main/events_stress.result rename to mysql-test/suite/events/events_stress.result diff --git a/mysql-test/main/events_stress.test b/mysql-test/suite/events/events_stress.test similarity index 100% rename from mysql-test/main/events_stress.test rename to mysql-test/suite/events/events_stress.test diff --git a/mysql-test/main/events_time_zone.result b/mysql-test/suite/events/events_time_zone.result similarity index 100% rename from mysql-test/main/events_time_zone.result rename to mysql-test/suite/events/events_time_zone.result diff --git a/mysql-test/main/events_time_zone.test b/mysql-test/suite/events/events_time_zone.test similarity index 100% rename from mysql-test/main/events_time_zone.test rename to mysql-test/suite/events/events_time_zone.test diff --git a/mysql-test/main/events_trans.result b/mysql-test/suite/events/events_trans.result similarity index 100% rename from mysql-test/main/events_trans.result rename to mysql-test/suite/events/events_trans.result diff --git a/mysql-test/main/events_trans.test b/mysql-test/suite/events/events_trans.test similarity index 100% rename from mysql-test/main/events_trans.test rename to mysql-test/suite/events/events_trans.test diff --git a/mysql-test/main/events_trans_notembedded.result b/mysql-test/suite/events/events_trans_notembedded.result similarity index 100% rename from mysql-test/main/events_trans_notembedded.result rename to mysql-test/suite/events/events_trans_notembedded.result diff --git a/mysql-test/main/events_trans_notembedded.test b/mysql-test/suite/events/events_trans_notembedded.test similarity index 100% rename from mysql-test/main/events_trans_notembedded.test rename to mysql-test/suite/events/events_trans_notembedded.test