Moved events tests from main to suite/events

This makes it easier to run test on just events.
MariaDB · May 3, 2023 · 78f684e · 78f684e
1 parent ec820a3
commit 78f684e
Show file tree

Hide file tree

Showing 34 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -186,6 +186,7 @@ END
     compat/mssql-
     compat/maxdb-
     encryption-
+    events-
     federated-
     funcs_1-
     funcs_2-
@@ -5961,7 +5962,7 @@ ($)
                         phases of test execution.
   stress=ARGS           Run stress test, providing options to
                         mysql-stress-test.pl. Options are separated by comma.
-  xml-report=<file>     Output jUnit xml file of the results.
+  xml-report=<file>     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
@@ -0,0 +1,12 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  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 → mysql-test/suite/events/events_1.result b/mysql-test/main/events_1.result → mysql-test/suite/events/events_1.result
diff --git a/mysql-test/main/events_1.test → mysql-test/suite/events/events_1.test b/mysql-test/main/events_1.test → mysql-test/suite/events/events_1.test
diff --git a/mysql-test/main/events_2.result → mysql-test/suite/events/events_2.result b/mysql-test/main/events_2.result → mysql-test/suite/events/events_2.result
diff --git a/mysql-test/main/events_2.test → mysql-test/suite/events/events_2.test b/mysql-test/main/events_2.test → mysql-test/suite/events/events_2.test
diff --git a/mysql-test/main/events_bugs-master.opt → ...-test/suite/events/events_bugs-master.opt b/mysql-test/main/events_bugs-master.opt → ...-test/suite/events/events_bugs-master.opt
diff --git a/mysql-test/main/events_bugs.result → mysql-test/suite/events/events_bugs.result b/mysql-test/main/events_bugs.result → mysql-test/suite/events/events_bugs.result
diff --git a/mysql-test/main/events_bugs.test → mysql-test/suite/events/events_bugs.test b/mysql-test/main/events_bugs.test → mysql-test/suite/events/events_bugs.test
diff --git a/mysql-test/main/events_embedded.result → ...-test/suite/events/events_embedded.result b/mysql-test/main/events_embedded.result → ...-test/suite/events/events_embedded.result
diff --git a/mysql-test/main/events_embedded.test → mysql-test/suite/events/events_embedded.test b/mysql-test/main/events_embedded.test → mysql-test/suite/events/events_embedded.test
diff --git a/mysql-test/main/events_grant.result → mysql-test/suite/events/events_grant.result b/mysql-test/main/events_grant.result → mysql-test/suite/events/events_grant.result
diff --git a/mysql-test/main/events_grant.test → mysql-test/suite/events/events_grant.test b/mysql-test/main/events_grant.test → mysql-test/suite/events/events_grant.test
diff --git a/mysql-test/main/events_logs_tests-master.opt → ...suite/events/events_logs_tests-master.opt b/mysql-test/main/events_logs_tests-master.opt → ...suite/events/events_logs_tests-master.opt
diff --git a/mysql-test/main/events_logs_tests.result → ...est/suite/events/events_logs_tests.result b/mysql-test/main/events_logs_tests.result → ...est/suite/events/events_logs_tests.result
diff --git a/mysql-test/main/events_logs_tests.test → ...-test/suite/events/events_logs_tests.test b/mysql-test/main/events_logs_tests.test → ...-test/suite/events/events_logs_tests.test
diff --git a/mysql-test/main/events_microsec.result → ...-test/suite/events/events_microsec.result b/mysql-test/main/events_microsec.result → ...-test/suite/events/events_microsec.result
diff --git a/mysql-test/main/events_microsec.test → mysql-test/suite/events/events_microsec.test b/mysql-test/main/events_microsec.test → mysql-test/suite/events/events_microsec.test
diff --git a/mysql-test/main/events_restart-master.opt → ...st/suite/events/events_restart-master.opt b/mysql-test/main/events_restart-master.opt → ...st/suite/events/events_restart-master.opt
diff --git a/mysql-test/main/events_restart.result → ...l-test/suite/events/events_restart.result b/mysql-test/main/events_restart.result → ...l-test/suite/events/events_restart.result
diff --git a/mysql-test/main/events_restart.test → mysql-test/suite/events/events_restart.test b/mysql-test/main/events_restart.test → mysql-test/suite/events/events_restart.test
diff --git a/mysql-test/main/events_scheduling.result → ...est/suite/events/events_scheduling.result b/mysql-test/main/events_scheduling.result → ...est/suite/events/events_scheduling.result
diff --git a/mysql-test/main/events_scheduling.test → ...-test/suite/events/events_scheduling.test b/mysql-test/main/events_scheduling.test → ...-test/suite/events/events_scheduling.test
diff --git a/mysql-test/main/events_slowlog.result → ...l-test/suite/events/events_slowlog.result b/mysql-test/main/events_slowlog.result → ...l-test/suite/events/events_slowlog.result
diff --git a/mysql-test/main/events_slowlog.test → mysql-test/suite/events/events_slowlog.test b/mysql-test/main/events_slowlog.test → mysql-test/suite/events/events_slowlog.test
diff --git a/mysql-test/main/events_stress.result → mysql-test/suite/events/events_stress.result b/mysql-test/main/events_stress.result → mysql-test/suite/events/events_stress.result
diff --git a/mysql-test/main/events_stress.test → mysql-test/suite/events/events_stress.test b/mysql-test/main/events_stress.test → mysql-test/suite/events/events_stress.test
diff --git a/mysql-test/main/events_time_zone.result → ...test/suite/events/events_time_zone.result b/mysql-test/main/events_time_zone.result → ...test/suite/events/events_time_zone.result
diff --git a/mysql-test/main/events_time_zone.test → ...l-test/suite/events/events_time_zone.test b/mysql-test/main/events_time_zone.test → ...l-test/suite/events/events_time_zone.test
diff --git a/mysql-test/main/events_trans.result → mysql-test/suite/events/events_trans.result b/mysql-test/main/events_trans.result → mysql-test/suite/events/events_trans.result
diff --git a/mysql-test/main/events_trans.test → mysql-test/suite/events/events_trans.test b/mysql-test/main/events_trans.test → mysql-test/suite/events/events_trans.test
diff --git a/...test/main/events_trans_notembedded.result → ...te/events/events_trans_notembedded.result b/...test/main/events_trans_notembedded.result → ...te/events/events_trans_notembedded.result
diff --git a/...l-test/main/events_trans_notembedded.test → ...uite/events/events_trans_notembedded.test b/...l-test/main/events_trans_notembedded.test → ...uite/events/events_trans_notembedded.test