From: Bjorn Munch
Date: September 20 2010 8:12am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3090) Bug#56787
List-Archive: http://lists.mysql.com/commits/118565
X-Bug: 56787
Message-Id: <201009200812.o8K8CwE7016877@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1463207825=="

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

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

 3090 Bjorn Munch	2010-09-20
      Bug #56787 MTR completion report should be more informative
      Added counts of skipped test, inclusing how many by test itself
      Also fixed misspelling in the (hitherto unused) variable name

    modified:
      mysql-test/lib/mtr_report.pm
=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2010-06-10 08:34:16 +0000
+++ b/mysql-test/lib/mtr_report.pm	2010-09-20 08:12:39 +0000
@@ -229,7 +229,8 @@ sub mtr_report_stats ($$;$) {
   # Find out how we where doing
   # ----------------------------------------------------------------------
 
-  my $tot_skiped= 0;
+  my $tot_skipped= 0;
+  my $tot_skipdetect= 0;
   my $tot_passed= 0;
   my $tot_failed= 0;
   my $tot_tests=  0;
@@ -246,8 +247,9 @@ sub mtr_report_stats ($$;$) {
     }
     elsif ( $tinfo->{'result'} eq 'MTR_RES_SKIPPED' )
     {
-      # Test was skipped
-      $tot_skiped++;
+      # Test was skipped (disabled not counted)
+      $tot_skipped++ unless $tinfo->{'disable'};
+      $tot_skipdetect++ if $tinfo->{'skip_detected_by_test'};
     }
     elsif ( $tinfo->{'result'} eq 'MTR_RES_PASSED' )
     {
@@ -376,6 +378,9 @@ sub mtr_report_stats ($$;$) {
     print "All $tot_tests tests were successful.\n\n";
   }
 
+  print "$tot_skipped tests were skipped, ".
+    "$tot_skipdetect by the test itself.\n\n" if $tot_skipped;
+
   if ( $tot_failed != 0 || $found_problems)
   {
     mtr_error("there were failing test cases") unless $dont_error;


--===============1463207825==
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/mtr-55/
# testament_sha1: d1c05e7d4181adb4eaea81c697ad8f78f0e6e2a0
# timestamp: 2010-09-20 10:12:58 +0200
# source_branch: file:///home/bm136801/my/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   j18s8j85vuz3c701
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWhkQ4wAAcdfgFAQXO///3IC
FAS////6UARarne9he69D3PPS7vCUIjVN6mmUxqempmIk9GanqQPU9IaYZR6glJohgI01UegB6UG
mTEADTJoAlBAmhMmlPJmpN6po9TBA9IAGgaCRUaIyYk8JGmh6QYmgA0AAAkokyegp+mpqZPJMj1M
mjJ6T1AaAaAOGfDoGJfP77jm4bWnksX3nt9zypaIRvd5+XRawjiCMieun75aOarwonr4dyiqnpvP
MnkgLuz1krxyjC1Seax2YY3clfXp9JbuvbN99LD9xfnFm+fg8cWKR56XrYSJwvw6ax2Qb1zV6bvD
Ma0eqG5yZWZmY/xPS5KblpJGF9jrEK5TbLpcayCyk+fTm9rsuHDitENIoVsU0KYJanpcZE0DENIe
k0LE5aFImgtTESdigpieSOMmaxwrYgfBycJ5/YxZFBIQyfDotV59Gn5RX+NOkSI6tzunz03qyywh
TgOArZEVi+yEJsuAYmbipBO0Q7EPJkwSVzj1MrXTfv8jhYZx2uqmNPOZXiyhmDJTpd7THSsTlw1e
JYY9dM/6nO8YNFTE0WzJaQ3SJEjeawzBnAUMd44RbcdFnsuIxUryW983Gn82oUtnIhkapngzdunq
ajZLZVlHWydj95G4lx7UvLIyz0GFLVqlqkCNYtIoFCORJwP9CPhhwTdRq9qMS2IF+W7SiBSxTWSj
t1SnLUQs2LfKdibBguLnksNbJJkWSwJhKaxk6C0fg1SLTj2Pcpt9MLjBEIkFVFPfcOyHLk2TCfyd
ichly0PiQXtDVULnLmMu1a5iN9AjWJ8cQdeGBB+SeKEPo8PHES7yrK3alpcK3usEWB/dYmB43l1Z
pcT1KMlItYzcOrMhXYWxEXEkV1qlHSxHLZfMLXZNKTJBFp7okqLDn2VTbErxDHTlzeTce/bfosvZ
nMCZtHswz7s/hHRWXtjxhi4EgVRz1dTyS5gai25lsuq7Mr14cmJias7UVEzV9flCFVlOmB9lRliD
8YOR7pS2odYb7KeMw+QvIlImFu8tRS9rCpy7Xm9Cg2iJqCsnxN0z6ca3uJZB5zG3McfpW/z60Y+Z
yCzRg0az6hRw3OcoZsbnYQlSLycxhpzvGuplpgrUwXdkSOTPaysJUjLDjGhEFDQt5ZyUQ0bndITO
oswTX2yUS6kjaKzmC401kM5tGI68x38kQkP6bK0bxbKCINBYLMjaqIRQgolHi+zkLBUdmRWSemfm
Y9hXuNV25BKoSgeIiYMk4bAWVEFe0rdFA8BYTVqrHutqJQKEpJ+o4EV3BKaJWtWr6DQ7+GVqKmAi
cZDQihbxS7i5CMcJgFXdwgLaKmGqdFfrRmITxgXp0XXxoD/BUgMbMCyaOTY6fCoxNKoHnivsvumO
FkbkjTI5IoaiVEVYA7HTU1ZZiMYVlKe1T/FMcMwqmCJsCjXRGpmjTUV23Qkm86EiqMZtI735OhbB
bHVSLaLNYG6seqdQkTvpm4iRSBST48BRXbk4mt0TqMWj8l5/xdyRThQkGhkQ4wA=


--===============1463207825==--