database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug #55968 MTR does not clean up properly and chokes on its discharge

Browse Source 
Added --clean-vardir to empty vardir if no failures
Also added variable $MTR_CLEAN_VARDIR
This commit is contained in:
Bjorn Munch
2010-10-13 13:07:28 +02:00
parent eede3f11f7
commit 2b8ca42ffe
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/mysql-test-run.pl
View File

@ -195,6 +195,7 @@ sub using_extern { return (keys %opts_extern > 0);};
our $opt_fast= 0; our $opt_fast= 0;
our $opt_force; our $opt_force;
our $opt_mem= $ENV{'MTR_MEM'}; our $opt_mem= $ENV{'MTR_MEM'};
our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
our $opt_gcov; our $opt_gcov;
our $opt_gcov_exe= "gcov"; our $opt_gcov_exe= "gcov";
@ -476,6 +477,8 @@ sub main {
mtr_report_stats("Completed", $completed); mtr_report_stats("Completed", $completed);
remove_vardir_subs() if $opt_clean_vardir;
exit(0); exit(0);
} }
@ -946,6 +949,7 @@ sub command_line_setup {
'tmpdir=s' => \$opt_tmpdir, 'tmpdir=s' => \$opt_tmpdir,
'vardir=s' => \$opt_vardir, 'vardir=s' => \$opt_vardir,
'mem' => \$opt_mem, 'mem' => \$opt_mem,
'clean-vardir' => \$opt_clean_vardir,
'client-bindir=s' => \$path_client_bindir, 'client-bindir=s' => \$path_client_bindir,
'client-libdir=s' => \$path_client_libdir, 'client-libdir=s' => \$path_client_libdir,
@ -2202,6 +2206,12 @@ sub environment_setup {
} }
sub remove_vardir_subs() {
foreach my $sdir ( glob("$opt_vardir/*") ) {
mtr_verbose("Removing subdir $sdir");
rmtree($sdir);
}
}
# #
# Remove var and any directories in var/ created by previous # Remove var and any directories in var/ created by previous
@ -2246,11 +2256,7 @@ sub remove_stale_vardir () {
mtr_error("The destination for symlink $opt_vardir does not exist") mtr_error("The destination for symlink $opt_vardir does not exist")
if ! -d readlink($opt_vardir); if ! -d readlink($opt_vardir);
foreach my $bin ( glob("$opt_vardir/*") ) remove_vardir_subs();
{
mtr_verbose("Removing bin $bin");
rmtree($bin);
}
} }
} }
else else
@ -5502,6 +5508,8 @@ Options to control directories to use
for tmpfs (/dev/shm) for tmpfs (/dev/shm)
The option can also be set using environment The option can also be set using environment
variable MTR_MEM=[DIR] variable MTR_MEM=[DIR]
clean-vardir Clean vardir if tests were successful and if
running in "memory". Otherwise this option is ignored
client-bindir=PATH Path to the directory where client binaries are located client-bindir=PATH Path to the directory where client binaries are located
client-libdir=PATH Path to the directory where client libraries are located client-libdir=PATH Path to the directory where client libraries are located