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:40:50 +1100 |
| commit | 9b42506a216ac3a289e506b1d85927ff4df75a75 (patch) | |
| tree | 038d415f8471ee08d12a8d83ad7a7b5151fedc52 /mysql-test/include/expect_crash.inc | |
| parent | dccbb5a6dba21b241e1796af82a0db85de28d195 (diff) | |
| download | mariadb-git-bb-10.5-mdev-27912.tar.gz | |
MDEV-27912 Fixing inconsistency w.r.t. expect files in tests.bb-10.5-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/include/expect_crash.inc')
| -rw-r--r-- | mysql-test/include/expect_crash.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/expect_crash.inc b/mysql-test/include/expect_crash.inc index af8b0908104..b4bd9828a08 100644 --- a/mysql-test/include/expect_crash.inc +++ b/mysql-test/include/expect_crash.inc @@ -1,5 +1,5 @@ ---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 # There should be a debug crash after using this .inc file --exec echo "wait" > $_expect_file_name |