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

Change rmtree+mkpath to use clean_dir

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-05-05 00:21:12 +02:00
parent 9d6d039cf1
commit be295c87cc
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3161,6 +3161,30 @@ sub check_expected_crash_and_restart {
} }
# Remove all files and subdirectories of a directory
sub clean_dir {
my ($dir)= @_;
finddepth(
{ no_chdir => 1,
wanted => sub {
if (-d $_){
# A dir
if ($_ eq $dir){
# The dir to clean
return;
} else {
rmdir($_) or mtr_warning("rmdir failed: $!");
}
} else {
# Hopefully a file
unlink($_) or mtr_warning("unlink failed: $!");
}
}
},
$dir);
}
sub clean_datadir { sub clean_datadir {
mtr_verbose("Cleaning datadirs..."); mtr_verbose("Cleaning datadirs...");
@ -3183,11 +3207,9 @@ sub clean_datadir {
} }
# Remove all files in tmp and var/tmp # Remove all files in tmp and var/tmp
rmtree("$opt_vardir/tmp"); clean_dir("$opt_vardir/tmp");
mkpath("$opt_vardir/tmp");
if ($opt_tmpdir ne "$opt_vardir/tmp"){ if ($opt_tmpdir ne "$opt_vardir/tmp"){
rmtree($opt_tmpdir); clean_dir($opt_tmpdir);
mkpath($opt_tmpdir);
} }
} }