From: Bjorn Munch
Date: April 19 2011 12:03pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3204) Bug#12373916
List-Archive: http://lists.mysql.com/commits/135708
X-Bug: 12373916
Message-Id: <201104191203.p3JC3ko5018744@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2091631852=="

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

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

 3204 Bjorn Munch	2011-04-19
      Bug #12373916 MTR SHOULD FLAG PRESENCE OF VALGRIND MEMORY LEAK REPORTS IN A CLEARER WAY
      Produce a pseudo test valgrind_reports.
      Reports are generated by each worker, don't want one test for each.
      Send message 'VALGREP' if report was found, master thread will pick this up

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-18 13:37:01 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-19 12:01:32 +0000
@@ -280,6 +280,7 @@ my $opt_valgrind_mysqltest= 0;
 my @default_valgrind_args= ("--show-reachable=yes");
 my @valgrind_args;
 my $opt_valgrind_path;
+my $valgrind_reports= 0;
 my $opt_callgrind;
 my %mysqld_logs;
 my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
@@ -504,6 +505,25 @@ sub main {
 
   push @$completed, run_ctest() if $opt_ctest;
 
+  if ($opt_valgrind) {
+    # Create minimalistic "test" for the reporting
+    my $tinfo = My::Test->new
+      (
+       name           => 'valgrind_report',
+      );
+    # Set dummy worker id to align report with normal tests
+    $tinfo->{worker} = 0 if $opt_parallel > 1;
+    if ($valgrind_reports) {
+      $tinfo->{result}= 'MTR_RES_FAILED';
+      $tinfo->{comment}= "Valgrind reported failures at shutdown, see above";
+      $tinfo->{failures}= 1;
+    } else {
+      $tinfo->{result}= 'MTR_RES_PASSED';
+    }
+    mtr_report_test($tinfo);
+    push @$completed, $tinfo;
+  }
+
   mtr_print_line();
 
   if ( $opt_gcov ) {
@@ -704,6 +724,9 @@ sub run_test_server ($$$) {
 	elsif ($line =~ /^SPENT/) {
 	  add_total_times($line);
 	}
+	elsif ($line eq 'VALGREP' && $opt_valgrind) {
+	  $valgrind_reports= 1;
+	}
 	else {
 	  mtr_error("Unknown response: '$line' from client");
 	}
@@ -889,6 +912,7 @@ sub run_worker ($) {
       my $valgrind_reports= 0;
       if ($opt_valgrind_mysqld) {
         $valgrind_reports= valgrind_exit_reports();
+	print $server "VALGREP\n" if $valgrind_reports;
       }
       if ( $opt_gprof ) {
 	gprof_collect (find_mysqld($basedir), keys %gprof_dirs);


--===============2091631852==
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/valgfail-55/
# testament_sha1: 92ea8ff3a08f334a04c86a493de195c72059df8f
# timestamp: 2011-04-19 14:03:46 +0200
# base_revision_id: bjorn.munch@stripped\
#   5ctnneerw34hdujw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTrjMDEAAipfgFiwXef//3/v
36S////6UAVaNvGxLrZ7t3ea9t3t55g0JGmgmUzUZonqNqT9T2oj1TAGRkyaj0aIHoyhhKIQyaNA
FGp6nqYynpMgAAGgANDTTRoJQgIJoI9J6E0yR6mgAeoDTTI00BoNGZQSSUyT1NpD9UNPSaaaMmgA
yGTCMgMIMmQAkkjIE09TQj1NMKbKZoepPSGm1AeoAAAaCKARDZjt4Nt3aHSe3Ttmq6KYdSy+jIPO
zNl1QwGrPq5uElIhrttCka1inIV3iIAlAAaqEHxXqm9sOz/3nEirfG2Op4rPLHvGDMBm09YEjrwO
qh1cJ3WvC8tLzqG+kGtvJsV98fVk1YEsW5fHP9tUGhL4s9g92328kzAulZ7Hn1snXhwwRG87PE+r
V++LRCE5TBt8Jim5X2vRi3S8CRu2vos4Zd7Lzc+8lTahqCrxjfL2sKovID3OVNa9Jg7o4MKzUepx
3G7Df0vzLRcK07BDdIV0Ig6bSZ5DRPcRfmrypFQliaiTLB4iLTB3QYRIwu0pHkojr78p1tqT1Q/V
j9YoTFM+ahKmUNftgItMm2AidPUXw5qRVnTRCzfrlFEOhe8t3Stk8XEg4xXkuDHYrBKCZGpJpVnO
wkyKrv6RJU6ClRCsSEoOSjJjUx1RSnAswiZhIaJVNUSRLVDRE+AVFd8J1vs4Eq2xlWkIAknI7Bmw
SLYwQWoleIZ3yDaZSmi5cblGJE84Lkx17DczQDFmykzekXkvrVwaLmrcPzS+9HGVZr2F8iATZvdA
iNDfmbuj+CgkqYY8IntE4CRFQwYYrJzzNsqpq7DMbBtjRHvni4nnXRXSW2luksrwm9F+J8ELL0bF
fQxFkWKvJhGSwIcWty8qHPdt6B3EjAiVyv0b6jB+kPrif6KgScxED/eTNsAPFtj3lFVX6TopKWef
pxLobqbnA/uyn7SCLOi2HsfV1wB15dYo5qswl0TElmXD+s5RyxhQNvKB63QhBhM2KXZQsOBZm+uO
EIKPpcIHxZjIVcLhCFAOktyvItdcIyxEQRR44g4BnLBnwGAIFZlyiwmjwkYZBTAo41pltZTxrlmx
XAOo3RnfmqO/h8ZRk4Eu3TE3mRXhrhNnUXMzJEypKcMkc6IdeHZELgmTmw5acHbhlyTkkwkjORRN
y2egxb2lmYNAcgFGnTI5p44X3N1qwCbBaQSRDCLAvzC2G0y2HmWjY2QYmOK8eyBasBxlcaur8DDN
d7qAtQy/Kula+dhh0d2TYKSZUGFWZHIKKH1oNSfK1tqqzw0I8VTUNELbDmUKw20yA69ggpqBWlet
jJla2i7mOMpNmqEUDB0M8TpLrBRFDDzzuQR3pnLsGBSBAJamJOXPfFKb3A5s9lnx9SLKhxUvMvAa
hMLTLdTjYSiQtTWCiQwmQIu5tO5CwNnIFMaXyOMxsNvgSNmkOFWLMGirg0K9peEQg4H0Igtavlqo
RDWpC1rKStKHETWiF9t9kmbrroGYRruUeQe8br8aIaWWw8u1KZWY9NXWVyITow2CnTg69Ui2pOYR
tGmnBn7ZRF9t8tCqSqZDmBlyj+dwrAmeUxKCWWGJnPLKaiPpIjCRa8CeC3kKFToKslyfjK5ZqpQy
dECqSVdAKODEx5hUxMIt8IBuqdOdEITGORJS4nuu9zkXjEMMjB1DYNbyiHIgx1pBui+XqIISUDJE
cg5FYWzhZwlo3gvX+GvC4rsjKoHVJn7/Ivi4gviGGi8DkeKMuqDYnObmzjKo9R7bnmIMbsVnmWZ8
1uBZfhio5F2iXtSO5TVebgDMROMHzhim1WJOiMSK1jjQYd9gWuGcUE90UQuroiaLNkTDM05UqkcS
jiEwPLAYexqsjxk+QZSklDmHGPhwvDiNwqUS5n5ZWoqvhsQ110W4ln/4u5IpwoSB1xmBiA==


--===============2091631852==--