From 7a93d4535ff853b6dd352a7169c9dae03f4a75b4 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 7 Sep 2022 17:27:33 +0200 Subject: [PATCH] MDEV-18353 fixup. Run mtr test on Windows mtr supports running processes in background on Windows since 10.8. Rename shutdown_not_windows.test to shutdown_debug.test, and allow this test everywhere. --- ...wn_not_windows.combinations => shutdown_debug.combinations} | 0 .../{shutdown_not_windows.result => shutdown_debug.result} | 0 .../main/{shutdown_not_windows.test => shutdown_debug.test} | 3 +-- 3 files changed, 1 insertion(+), 2 deletions(-) rename mysql-test/main/{shutdown_not_windows.combinations => shutdown_debug.combinations} (100%) rename mysql-test/main/{shutdown_not_windows.result => shutdown_debug.result} (100%) rename mysql-test/main/{shutdown_not_windows.test => shutdown_debug.test} (86%) diff --git a/mysql-test/main/shutdown_not_windows.combinations b/mysql-test/main/shutdown_debug.combinations similarity index 100% rename from mysql-test/main/shutdown_not_windows.combinations rename to mysql-test/main/shutdown_debug.combinations diff --git a/mysql-test/main/shutdown_not_windows.result b/mysql-test/main/shutdown_debug.result similarity index 100% rename from mysql-test/main/shutdown_not_windows.result rename to mysql-test/main/shutdown_debug.result diff --git a/mysql-test/main/shutdown_not_windows.test b/mysql-test/main/shutdown_debug.test similarity index 86% rename from mysql-test/main/shutdown_not_windows.test rename to mysql-test/main/shutdown_debug.test index e93867e2227..0e8e8e5921c 100644 --- a/mysql-test/main/shutdown_not_windows.test +++ b/mysql-test/main/shutdown_debug.test @@ -1,4 +1,3 @@ -source include/not_windows.inc; source include/not_embedded.inc; source include/have_debug.inc; --echo # @@ -8,7 +7,7 @@ call mtr.add_suppression('Thread .* did not exit'); set @old_dbug=@@global.debug_dbug; set global debug_dbug='+d,CONNECT_wait'; select variable_value into @cons from information_schema.global_status where variable_name='connections'; -exec $MYSQL -e 'select sleep(3600)' >/dev/null 2>&1 &; +exec $MYSQL -e "select sleep(3600)" >/dev/null 2>&1 &; let $wait_condition= select variable_value>@cons from information_schema.global_status where variable_name='connections'; source include/wait_condition.inc; source include/restart_mysqld.inc;