mirror of
https://github.com/MariaDB/server.git
synced 2025-07-21 21:22:27 +03:00
7c91082e39
mtr uses group suffix, but some existing inc and test files use
server_id for expect files. This patch aims to fix that.
For spider:
With this change we will not have to maintain a separate version of
restart_mysqld.inc for spider, that duplicates code, just because
spider tests use different names for expect files, and shutdown_mysqld
requires magical names for them.
With this change spider tests will also be able to use other features
provided by restart_mysqld.inc without code duplication, like the
parameter $restart_parameters (see e.g. the testcase mdev_29904.test
in commit ef1161e5d4f).
Tests run after this change: default, spider, rocksdb, galera, using
the following command
mtr --parallel=auto --force --max-test-fail=0 --skip-core-file
mtr --suite spider,spider/*,spider/*/* \
--skip-test="spider/oracle.*|.*/t\..*" --parallel=auto --big-test \
--force --max-test-fail=0 --skip-core-file
mtr --suite galera --parallel=auto
mtr --suite rocksdb --parallel=auto
43 lines
1.2 KiB
PHP
43 lines
1.2 KiB
PHP
# ==== Usage ====
|
|
#
|
|
# [--let $shutdown_timeout= 60]
|
|
# [--let $allow_rpl_inited= 1]
|
|
# --source include/shutdown_mysqld.inc
|
|
|
|
# The default value is empty
|
|
--let $server_shutdown_timeout=
|
|
|
|
if ($shutdown_timeout)
|
|
{
|
|
--let $server_shutdown_timeout= $shutdown_timeout
|
|
}
|
|
|
|
# This is the first half of include/restart_mysqld.inc.
|
|
if ($rpl_inited)
|
|
{
|
|
if (!$allow_rpl_inited)
|
|
{
|
|
--die ERROR IN TEST: When using the replication test framework (master-slave.inc, rpl_init.inc etc), use rpl_restart_server.inc instead of restart_mysqld.inc. If you know what you are doing and you really have to use restart_mysqld.inc, set allow_rpl_inited=1 before you source restart_mysqld.inc
|
|
}
|
|
}
|
|
|
|
# Write file to make mysql-test-run.pl expect the "crash", but don't start it
|
|
--let $_expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')`
|
|
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
|
|
--exec echo "wait" > $_expect_file_name
|
|
|
|
--let $server_shutdown_timeout= 60
|
|
if ($shutdown_timeout)
|
|
{
|
|
--let $server_shutdown_timeout= $shutdown_timeout
|
|
}
|
|
if ($shutdown_timeout == 0)
|
|
{
|
|
--let $server_shutdown_timeout= 0
|
|
}
|
|
|
|
# Send shutdown to the connected server
|
|
--shutdown_server $server_shutdown_timeout
|
|
--source include/wait_until_disconnected.inc
|
|
|