diff options
| author | Yuchen Pei <yuchen.pei@mariadb.com> | 2023-01-18 11:51:28 +1100 |
|---|---|---|
| committer | Yuchen Pei <yuchen.pei@mariadb.com> | 2023-03-22 22:58:47 +1100 |
| commit | 6ffd77538e5dcf3ba24c4e787a10499c5f52c857 (patch) | |
| tree | 78c91ece2760948face5992d20d13c1e807d4878 /mysql-test/main/shutdown.test | |
| parent | 78d0d74eb72ac4e8f763511d9d20dda020dd8673 (diff) | |
| download | mariadb-git-bb-10.10-mdev-27912.tar.gz | |
MDEV-27912 Fixing inconsistency w.r.t. expect files in tests.bb-10.10-mdev-27912
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
Diffstat (limited to 'mysql-test/main/shutdown.test')
| -rw-r--r-- | mysql-test/main/shutdown.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/shutdown.test b/mysql-test/main/shutdown.test index 13b7ac3f672..71f2156a17f 100644 --- a/mysql-test/main/shutdown.test +++ b/mysql-test/main/shutdown.test @@ -18,8 +18,8 @@ disconnect c1; create procedure try_shutdown() shutdown; drop procedure try_shutdown; ---let $_server_id= `SELECT @@server_id` ---let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect +--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 --send shutdown |