From bea47a6f59d0aa80461877d04f81b96e1c487362 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 13 Apr 2022 15:05:19 +1000 Subject: [PATCH] MDEV-27791: rocksdb_log_dir test postfix We can only remove a subdirectory in mtr on an installed instance Example failure previously: CURRENT_TEST: rocksdb.rocksdb_log_dir mysqltest: At line 15: Path '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/tmp/1' is not a subdirectory of MYSQLTEST_VARDIR '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/1'or MYSQL_TMP_DIR '/usr/local/mariadb-10.9.0-linux-systemd-x86_64/mysql-test/var/tmp/1' --- storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test index 4932011a38c..948e12edb4d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_log_dir.test @@ -12,4 +12,4 @@ DROP DATABASE mysqltest; --list_files $MYSQL_TMP_DIR *LOG # Clean up -remove_files_wildcard $MYSQL_TMP_DIR *LOG; +remove_files_wildcard $MYSQL_TMP_DIR/./ *LOG;