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

--===============0945131646==
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
      Not sure how useful this really is

    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 10:13:02 +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= 0;
 
 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
 


--===============0945131646==
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: a5f9ff58fdc0bb629dfde34dc256498c0f597744
# timestamp: 2010-10-07 12:14:13 +0200
# base_revision_id: bjorn.munch@stripped\
#   lwe80a2k6hcrqre6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQiPPU8AAe9/gGEwBABc9///
egOUBL////pQBKLdMobcyCzbBwlEEp4mTKNoGTRpiU9TaT9SNB6h6j1Dag2oNIAJmoxIGpp6RpNA
BkMIyaBk9IJIgJMjRoU/SjNGppjSGjagaAAaGgxQmkyYJNqZMjaT01B6IyNNANAABzRkxMAExGBG
mBBiMEyYBGQA9VyFeewZ1V/lR96vQXV1h4tarZTjZVd0mQRYbcjHXxl45zY3UZkQHlPSxqH65ZX9
VJMlW37UKKokeHND+PiFz5hhngGOWunB0L3K2BWN/CyYX0eeSerZy3Wrof5x+MEdWouzW6gtLNxP
V/VH+1i6dYLCrRlwNMsBPNWcOLi9u7V87z3icnWVgb8MaWI07IbNZoUPHWsGHr7mjgdwiHbs4tS5
eMZXaVhu3C4Wgz42UkiAEzUMidiyQEi1I/MQYD3piQMI3XKCTjsLVHhEzuQn1wkBzKKt41UvJyck
FJuDaZpBlvE+o2ddVbJMR6pwtzFMlcML4CqFUWLvFvYbg+oso/hkkvKZT9EqakieMAh6NCZgtfIK
IBDRBEAHDEwbFoWJOBSD26qpAOOQqW6UU7DEASGSad/JNW5bqQ3FW79emzQzNRk5R1ls5NtaKRoa
qxLHQjSNFA/ENZ5hofFiBVylRCoCbCzAvWYoXdlBtdIlJkr+A2LGG1uQRrpSRYkwxfhuTlVLzjpe
UcNgeEcpb+YMBRFXZAljliDa2YJaJkdtuIseUbpWK9dxqfIaThfS6ByK5LIaLglDok2IgLAjZgC4
5TcmjFEGijGXIY1Icwp6cIQHwqqDSaNgdyU8GCVrAuzlz6tFpIkhSKHxoPpHOSb+290NC0NRHC6B
pUnYkobJB4FuDp46FjeWxIY+uRwXb4McTAHzDN9qCSIT6Q9XX59iWd+YfuM2sNpqFZ0jyNhQ0lOx
AvrN85OeQ7xIx9eNQTXZrhe5UQNHTt/jf1khZTmiBQkCv0zMgdS8vKcXfdWq9YN/DKwpJE0iMmuQ
bep4hEzQDrDBefK3iBdPJGdpz12yx6IFY2UOCNIqVegXM0Wxd7u07q66jc9b8Xft1V6KPBdfNhV3
JztYVIqZZsVb9c1xriu48bp7JBip2Bb2tR0AbDUbvZSU6Wil2JRu2Mwug2KlmmNmDyiZDQJLFJmT
6igkgLuSTOjex2ycB5PjJtonjgnARkkMgXiymhMrxxYE0t/Kmh8OUJQCMuGbowdbBcwqPA8tqIW5
y5LdQXG82ZgJwJ3AtAmjJCkTPxE11YpGNkN25WbG0EhgsVfPyVNnyK4IpMf92etI27br1hmKXFwz
J0iKgc4xFVi7JDEw7CTqtLyldTXooyyOt/PZrzeTqF0cQKKRTBThCn9B/+RCUMeNUyAlrq1LYPTT
bAHdn0tvSqetIuEQ4TjBoihheRDFFsDAMB5sUaAqRCU5gDCN21Ja5TBUfoUr2o59aIpn1yI2dTWL
pYFkjqNy4FJ66H+jEGwizjDvgn1xjuTzwwm2Rs0waxeHf8Wx5wzIsBljjkUh5NjnN2chiodg+mUo
6N+pjIm73J27cpdK0Mq3DOYtSChOIGPDpXTVfPIkPbXK2eG607b9MhjYlYop38SGsU7btHKUyDKN
Jti6mTFt30DmNCIbDZrYiE7xmj/i7kinChIBEeep4A==


--===============0945131646==--