From: Bjorn Munch
Date: September 16 2010 8:40am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3088) Bug#56787
List-Archive: http://lists.mysql.com/commits/118347
X-Bug: 56787
Message-Id: <201009160840.o8G8ePpq028577@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0931256690=="

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

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

 3088 Bjorn Munch	2010-09-16
      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-16 08:36:41 +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;


--===============0931256690==
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/skipped-55/
# testament_sha1: 9fc163963d7a6af08221ca367dac9be70c2649e8
# timestamp: 2010-09-16 10:40:25 +0200
# base_revision_id: bjorn.munch@stripped\
#   7p79p11wjb9xn8wn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYxlWpAAAb3fgFAQXO///3IC
FAS////6UARGO4aXevQZzttdwlEIKeAmTRqep6ZTCZpANTanqGno0mglIg01Pap4Snqek0MQAAAA
AAyEBNT0Cnko9Gk9lRjSDR6gBoB6gkUQRij1PT1QDRk9TQ9QAGgAAJSKn6npgk9Saeo9EbEmR5QA
aGgADQt69Awf/P87yzNWyClbG2Hl5tfulEHp7mw6MFjdDUCMRPfR65aOirwom7OGdRVT94nEmegF
qqsH3DVGC1vccY9V+FeSNjp9IeTv2xbdKY/b23hIt1fln3qJP3yqkxARdW7WyzWK+OO7t044jUuQ
jvY4Kqqo/wtyY5cEyD1CfgXghnjsO0ZR8ohpr09EwcdqyswBCEihwWbp6vJ7kmnYF8WIgCfIZuW1
b86gZBNBMohjIwxRMTVSoFRkdzEDttTOY6uRtT/hGIZHXPkuEdo8qGCYJVCMlKpWgdK8UEjiZWbE
5y2DFpakpZLu4uztEK5FyKwel7BrrSVRNgQvM2Z1RonbqGqMwrVM6t2aNo6w0NEpA2rJwFyxsMcC
obOtKxL2pIubrPa1Za4mU/SBDXHzBjhRwGcUQ062aIsZxw3eF83D+VzF0hc8VrAKTnbnkJA1GzJc
LJ30SGlRI6SOcR62lknzGE400pOaWzHQMEhRayhfHIiOpque92MbJVLraUhcaIoDSA4wZmVLFJ2n
oOFlDQKBMdLSR0lEFKQRwSIEIpg7mEu5DremWOpzVNPLbabUQiIFVFPfYNlOfNkt82luSFBdyekz
UDor3AfqOeu94ymIhbTQ1gfrpk2ZsIoUbGBfuhBVGts0236SmzZXG/cnaaRWc1nReo+tQngm+UyC
kM5VoHVeFxlOrMhbdbYiGhIlJWo6WkWSv0W2TlaoTpJk5OmxmtOuIYffz0YI4i4Wibtuuu3BjGsB
Kv7eUCPOp0X90lmo3sllCOf8D4TW5s/U4ewYgy+/1rXuZKUaVs+WEhJadiKiU2UeMEGbDLbAeiox
YgdGDUc187c43NcVLFirC80xG+7cXIpiy8rautxsQUSI1CJaGwSwmiZ94bYJ+ORCAwNWBd3Mp9u9
FhjLhlyKNGryCVw2eSOi7LDDADwS0iVBrsxi3TfPlTv30Qts0qrBwJsE4cnELBgSWHHdIgILF2Oa
RdTmZDs0tk/BEK7giWZBmdq3vHUC7Qe/kSIhu2ykV5ri4kK73FXpIQqhIgR5i9QZg2Pi7PiEchZV
KKZ6b9VHgLOQ7gca7iDQiLh/CKg3Kw0gsqJle0tjCwdJI6FVJcy1rs7agpwMYDZXFpiVnBtAEoQX
C81HXoglSTETBotmJCPE7OLBz33RAAsZmAcEoEN1sZIyIGhc4bBwSmx8gj4NTDHPApWvhhpepz6p
Y0qgfBDPdnljL2Rc8Uwz1d6RAlVmA6F+IxTBCiC2lNmto5isH3AWl5PAsGuiGourXSZ7/Kh+LlIi
FLwvmPYzV4v0OSysPHKSQHsm1NeVQkelII4ylMeYUKrEZ4GhcBw+raXn+LuSKcKEhGMq1IA=


--===============0931256690==--