#At file:///G:/bzr/mysql-6.0-falcon-team/ based on revid:hky@stripped
2997 Vladislav Vaintroub 2009-02-04
Fix new MTR windows bugs:
- Make CTRL-C work.
exit() would hang in signal handler,
use POSIX::_exit(), like in bug38692
- avoid symlink calls (e.g with --mem)
modified:
mysql-test/lib/mtr_report.pm
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm 2009-01-30 11:43:13 +0000
+++ b/mysql-test/lib/mtr_report.pm 2009-02-04 01:22:59 +0000
@@ -30,6 +30,8 @@ our @EXPORT= qw(report_option mtr_print_
mtr_report_test);
use mtr_match;
+use My::Platform;
+use POSIX qw[ _exit ];
require "mtr_io.pl";
my $tot_real_time= 0;
@@ -435,7 +437,14 @@ sub mtr_warning (@) {
sub mtr_error (@) {
print STDERR _name(), _timestamp(),
"mysql-test-run: *** ERROR: ", join(" ", @_), "\n";
- exit(1);
+ if (IS_WINDOWS)
+ {
+ POSIX::_exit(1);
+ }
+ else
+ {
+ exit(1);
+ }
}
=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl 2008-11-14 08:45:32 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl 2009-02-04 01:22:59 +0000
@@ -2407,7 +2407,7 @@ sub setup_vardir() {
mtr_error("The destination for symlink $opt_vardir does not exist")
if ! -d readlink($opt_vardir);
}
- elsif ( $opt_mem )
+ elsif ( $opt_mem && !$glob_win32)
{
# Runinng with "var" as a link to some "memory" location, normally tmpfs
mtr_verbose("Creating $opt_mem");
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2009-02-02 11:24:10 +0000
+++ b/mysql-test/mysql-test-run.pl 2009-02-04 01:22:59 +0000
@@ -2010,7 +2010,7 @@ sub setup_vardir() {
mtr_error("The destination for symlink $opt_vardir does not exist")
if ! -d readlink($opt_vardir);
}
- elsif ( $opt_mem )
+ elsif ( $opt_mem && !IS_WINDOWS)
{
# Runinng with "var" as a link to some "memory" location, normally tmpfs
mtr_verbose("Creating $opt_mem");
| Thread |
|---|
| • bzr commit into mysql-6.0-falcon-team branch (vvaintroub:2997) | Vladislav Vaintroub | 4 Feb |