From: Bjorn Munch
Date: October 7 2010 11:34am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3098) Bug#55968
List-Archive: http://lists.mysql.com/commits/120241
X-Bug: 55968
Message-Id: <201010071134.o97BY8sh000874@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1225248097=="

--===============1225248097==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/cleanvar-55/ based on revid:bjorn.munch@stripped

 3098 Bjorn Munch	2010-10-07
      Bug #55968 MTR does not clean up properly and chokes on its discharge
      Added --clean-vardir to empty vardir if no failures
      Also added variable $MTR_CLEAN_VARDIR

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-30 10:53:36 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-07 11:32:32 +0000
@@ -195,6 +195,7 @@ sub using_extern { return (keys %opts_ex
 our $opt_fast= 0;
 our $opt_force;
 our $opt_mem= $ENV{'MTR_MEM'};
+our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
 
 our $opt_gcov;
 our $opt_gcov_exe= "gcov";
@@ -476,6 +477,8 @@ sub main {
 
   mtr_report_stats("Completed", $completed);
 
+  remove_vardir_subs() if $opt_clean_vardir;
+
   exit(0);
 }
 
@@ -946,6 +949,7 @@ sub command_line_setup {
              'tmpdir=s'                 => \$opt_tmpdir,
              'vardir=s'                 => \$opt_vardir,
              'mem'                      => \$opt_mem,
+	     'clean-vardir'             => \$opt_clean_vardir,
              'client-bindir=s'          => \$path_client_bindir,
              '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
@@ -2246,11 +2256,7 @@ sub remove_stale_vardir () {
 	mtr_error("The destination for symlink $opt_vardir does not exist")
 	  if ! -d readlink($opt_vardir);
 
-	foreach my $bin ( glob("$opt_vardir/*") )
-	{
-	  mtr_verbose("Removing bin $bin");
-	  rmtree($bin);
-	}
+	remove_vardir_subs();
       }
     }
     else
@@ -5502,6 +5508,8 @@ Options to control directories to use
                         for tmpfs (/dev/shm)
                         The option can also be set using environment
                         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-libdir=PATH    Path to the directory where client libraries are located
 


--===============1225248097==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/cleanvar-55/
# testament_sha1: 8c78b2f9eb7f06f58ca21afaf19b8163160ad4d9
# timestamp: 2010-10-07 13:34:08 +0200
# base_revision_id: bjorn.munch@stripped\
#   lwe80a2k6hcrqre6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR09bacAAfD/gGEwBABc9///
fieVBL////pQBKK7uWwuetGe11eMEohJgUYZGk8BRtSeoz0kMI09RtENlGTQaE0JphJ6CZU/UaTy
mmmmgPUAAAANBJFNPU0qfk9KZTTT2qeptPSn6o0ADCZGmgAAGKVPxE00elM01Gm01NGTamTQA0AA
AaBKSATBGT1J6gNqbRpGnqaHkQBoGIxNMQPKspXRcM9le7pvKn7i2e0G21qt4zbvfqvxoJ2w6r2O
zxnOOc2J2edEB4p38rUP3uwmnf/ynHnr1eOhRVEkrQ/joBdM4w04hjlsp2OgecrcSsb+Vj2X6pvO
XLXzcz9CzvecWyKikR5lqMI7nE9n5n92C3ZYwI+2hyjMRzZy5dhdeTHjSnAnNQkUFT9KZlHP9Gyp
7ToJUbdFE1RkXYrpjgIN7aOW9KqxiboV+zGawXCDMM5IcCbczLDcFbiRNUxGQIlIgYRlcqoqNRX5
4MMOff7HjrhLNPJbFfYRIoF0ODUk4iAkeQurugUYETyQRf0wkGt2CFJ2h2KvkoIYH+C9o6qRbEWD
CU9uqF+rCnLEMG1g0rGAxeeCaAk5hUwiZomFpEyaUONEiKiUYOGobEseLR7VtpD7IgkC8GWUP4an
GzSDBl6/TqojnSUSLAhbtXI8LRcTie9CB1FQouFoJf6MhTSUclSSm0xFx0cXMBjsF5ezWAnakP4K
8p5LjqESc6lU8KatBUc1QuGBRUIlC04F184yiKS0CgkuG+uW8WX1LkBtGE5v224FNTHEEcQ4WZyh
Nwt2iIF62ZnJ0CutGbN1r4oLjQg0XLA1qgcwp6aIgHxKrTymHQGyb89VDEFpzcHNozkj1H4LYsJF
DcD1PDsOA/5bzeTt3Mj3jOHqrRhn/qYz0fxjClKVyIeE7SxHmKPI1wa+vWmA01nvF7eySP6SIhFl
c/jeDqhyROgNvDFfagkKErFIV/2layws7xzhyBlOcUxtkFsuoRlGCBRWLZ4HcQdYuLLL325FBLuW
6d5yog0/GGtNHihC3TkMoQ0zDZhOMU0ZvvOvrNNYnGh1gKsbbpWFJIpotEWK+Q27R+AmaCZnuKYp
UtekdZGnsnTf0cXHQ8rG4w6Uhrcgc7aLFZLZZMsuYTTnyaFk4MM/EnVUwmRUwzcnI9jquOSGzdum
ySyDFR8KsrUdiCktDmhG1QMqquITC1+1UpmVU0TiLxIUvQSJ9CgSAFSpDwDLM7hbAUjZFEkdXUin
3XYwoFQi0lbGjmCOGj7mutvLCIAfwMYXwa4oycxPETF69yR3RenEzXg4Q3ca27g0hpcL965IZis7
1RMLaJG7JEjh1JflRBToWPrufKfyQSoP4hnpD80QyyvouzQsvLxmTpElUcYxJTk7JDEB5St1OzAR
R3lAiJGRheDmwZZKIY8tIBktIcSGSI9oDtRIlApoZYAs5cLGca+9WHBrfgWNOJmUiZtWicRWiJz5
zAHWAunPRZQFKISgXBhF2Uk3XPAKxlodMPR5ElcWhRDpOBdswCtXIbi4h7trx/lUA2XoDRLyTJV3
EjqtMQm0A7C4dro9Z6c4FCEQDLPOJNCNz2b6hmZM8QTVrVvriYiR9aOjumJNiBMuANBmb2Ex3UCa
ANPH0DO1dVyQ986ad1x7N7fmMYpPNSVT7EVCtUCi6/VkTgZSsjWyg2+SAzH7lJYllorqH0yfq/4u
5IpwoSA6ettO


--===============1225248097==--