summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-02-14 13:30:52 +0100
committerSergei Golubchik <serg@mariadb.org>2018-02-21 17:48:25 +0100
commit5d8ac1ece1687278cbc860e97eae9c7cc163ee73 (patch)
treecf9077ec48ba781f0af4514983f7f34c4b585b5c /mysql-test/mysql-test-run.pl
parent50359719f0dd1f8f6d3d256a0db107654f8d39f1 (diff)
downloadmariadb-git-5d8ac1ece1687278cbc860e97eae9c7cc163ee73.tar.gz
log all mtr output in vardir/log/stdout.log
despite the name, it logs both stdout and stderr
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl9
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index eaec51b82b4..2581eb7b503 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -91,6 +91,7 @@ use My::Platform;
use My::SafeProcess;
use My::ConfigFactory;
use My::Options;
+use My::Tee;
use My::Find;
use My::SysInfo;
use My::CoreDump;
@@ -392,6 +393,11 @@ sub main {
initialize_servers();
init_timers();
+ unless (IS_WINDOWS) {
+ binmode(STDOUT,":via(My::Tee)") or die "binmode(STDOUT, :via(My::Tee)):$!";
+ binmode(STDERR,":via(My::Tee)") or die "binmode(STDERR, :via(My::Tee)):$!";
+ }
+
mtr_report("Checking supported features...");
executable_setup();
@@ -6280,7 +6286,8 @@ sub xterm_stat {
my $done = $num_tests - $left;
my $spent = time - $^T;
- printf "\e];mtr: spent %s on %d tests. %s (%d tests) left\a",
+ syswrite STDOUT, sprintf
+ "\e];mtr: spent %s on %d tests. %s (%d tests) left\a",
time_format($spent), $done,
time_format($spent/$done * $left), $left;
}