mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01: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
20 lines
625 B
PHP
20 lines
625 B
PHP
--echo Killing server ...
|
|
|
|
# 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
|
|
|
|
# Kill the connected server
|
|
--disable_reconnect
|
|
--let KILL_NODE_PIDFILE = `SELECT @@pid_file`
|
|
|
|
--perl
|
|
my $pid_filename = $ENV{'KILL_NODE_PIDFILE'};
|
|
my $mysqld_pid = `cat $pid_filename`;
|
|
chomp($mysqld_pid);
|
|
system("kill -9 $mysqld_pid");
|
|
exit(0);
|
|
EOF
|
|
|
|
--source include/wait_until_disconnected.inc
|