summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-05-13 13:42:32 +0200
committerSergei Golubchik <serg@mariadb.org>2020-05-13 13:42:32 +0200
commit3b251e24b6c8fe81bc5eeca086d9c1e57e6739d2 (patch)
treeba5a2098734332699e55f8b0c09b13261df2a6f1 /mysql-test/mysql-test-run.pl
parentb30a013142179a4bf72ce1779bea84596ba28685 (diff)
downloadmariadb-git-3b251e24b6c8fe81bc5eeca086d9c1e57e6739d2.tar.gz
Revert "Added --titlebar option to enable/disable the titlebar"
This reverts commit c675886dcdecd29571bd08605a409325ee81004c. The bug was introduced in e3f5789ac0b and fixed in 1af74d523a7 The option was introduced between those two commits and now it's redundant again.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl7
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f8cfb22537f..f84a2a645d7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -365,7 +365,7 @@ my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20);
my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10);
my $opt_core_on_failure= 0;
-my $opt_titlebar= 0;
+
my $opt_parallel= $ENV{MTR_PARALLEL} || 1;
my $opt_port_group_size = $ENV{MTR_PORT_GROUP_SIZE} || 20;
@@ -909,7 +909,7 @@ sub run_test_server ($$$) {
delete $next->{reserved};
}
- titlebar_stat(scalar(@$tests)) if $set_titlebar && $opt_titlebar;
+ titlebar_stat(scalar(@$tests)) if $set_titlebar;
if ($next) {
# We don't need this any more
@@ -1246,7 +1246,6 @@ sub command_line_setup {
'start-and-exit' => \$opt_start_exit,
'start' => \$opt_start,
'user-args' => \$opt_user_args,
- 'titlebar' => \$opt_titlebar,
'wait-all' => \$opt_wait_all,
'print-testcases' => \&collect_option,
'repeat=i' => \$opt_repeat,
@@ -6505,8 +6504,6 @@ Misc options
leaves just the server running
start-dirty Only start the servers (without initialization) for
the first specified test case
- titlebar Enable progress stats on the windows title bar. Works
- on Windows and Xterm.
user-args In combination with start* and no test name, drops
arguments to mysqld except those specified with
--mysqld (if any)