BUG#28203341: MTR: BACK-PORT THE FIX FOR BUG#28061910 TO 5.7

Fix for BUG#28061910 enables test-progress by default. Back-port
this fix to 5.7 branch.

Change-Id: Ia3728f83e5954021b791b7572e3d7b2833bb1df4

Author: Pavan Naik

mysql-test/lib/mtr_report.pm

@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,14 +32,15 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
 use mtr_match;
 use File::Spec;
 use My::Platform;
-use POSIX qw[ _exit ];
+use POSIX qw(_exit floor);
 use IO::Handle qw[ flush ];
 require "mtr_io.pl";
 use mtr_results;
 
 my $tot_real_time= 0;
 
 my $done_percentage= 0;
+my $tests_completed= 0;
 
 our $timestamp= 0;
 our $timediff= 0;
@@ -67,9 +68,11 @@ sub _name {
   return $name ? $name." " : undef;
 }
 
-sub _mtr_report_test_name ($)
+sub _mtr_report_test_name ($$)
 {
   my $tinfo= shift;
+  my $done_percentage= shift;
+
   my $tname= $tinfo->{name};
 
   return unless defined $verbose;
@@ -141,13 +144,13 @@ sub mtr_report_test ($) {
   {
     if ($tinfo->{'name'} && !$retry)
     {
-      $::remaining= $::remaining - 1;
-      $done_percentage = 100 - int (($::remaining * 100) /
-                                    ($::num_tests_for_report));
+      $tests_completed= $tests_completed + 1;
+      $done_percentage=
+        floor(($tests_completed / $::num_tests_for_report) * 100);
     }
   }
 
-  my $test_name = _mtr_report_test_name($tinfo);
+  my $test_name = _mtr_report_test_name($tinfo, $done_percentage);
 
   if ($result eq 'MTR_RES_FAILED'){
 

mysql-test/mysql-test-run.pl

@@ -137,7 +137,6 @@ BEGIN
 my $start_only;
 
 our $num_tests_for_report;      # for test-progress option
-our $remaining;
 
 my $auth_plugin;                # the path to the authentication test plugin
 
@@ -284,7 +283,7 @@ END
 
 our $opt_check_testcases= 1;
 my $opt_mark_progress;
-our $opt_test_progress;
+our $opt_test_progress= 1;
 my $opt_max_connections;
 our $opt_report_times= 0;
 
@@ -428,9 +427,7 @@ sub main {
 
   #######################################################################
   my $num_tests= @$tests;
-
   $num_tests_for_report = $num_tests * $opt_repeat;
-  $remaining= $num_tests_for_report;
 
   if ( $opt_parallel eq "auto" ) {
     # Try to find a suitable value for number of workers
@@ -1159,7 +1156,7 @@ sub command_line_setup {
              'record'                   => \$opt_record,
              'check-testcases!'         => \$opt_check_testcases,
              'mark-progress'            => \$opt_mark_progress,
-             'test-progress'            => \$opt_test_progress,
+             'test-progress:1'          => \$opt_test_progress,
 
              # Extra options used when starting mysqld
              'mysqld=s'                 => \@opt_extra_mysqld_opt,
@@ -1439,6 +1436,10 @@ sub command_line_setup {
     }
   }
 
+  if ($opt_test_progress != 0 and $opt_test_progress != 1) {
+    mtr_error("Invalid value '$opt_test_progress' for option 'test-progress'.");
+  }
+
   # disable syslog / EventLog in normal (non-bootstrap) operation.
   push(@opt_extra_mysqld_opt, "--log-syslog=0");
 
@@ -7324,7 +7325,8 @@ ($)
   record TESTNAME       (Re)genereate the result file for TESTNAME
   check-testcases       Check testcases for sideeffects
   mark-progress         Log line number and elapsed time to <testname>.progress
-  test-progress         Print the percentage of tests completed
+  test-progress[={0|1}] Print the percentage of tests completed. This setting
+                        is enabled by default.
 
 Options that pass on options (these may be repeated)