MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:May 28 2009 11:04am
Subject:bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2798) Bug#43659
View as plain text  
#At file:///home/bm136801/my/worker-51/

 2798 Bjorn Munch	2009-05-28
      Bug #43659 MTR2 should report worker data for tests when using --parallel > 1
      Adding "w# " before the test result
      Also enable --parallel=2 so this can be tested.
      modified:
        mysql-test/collections/default.push
        mysql-test/lib/mtr_report.pm
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2009-02-24 11:53:34 +0000
+++ b/mysql-test/collections/default.push	2009-05-28 11:02:03 +0000
@@ -1,5 +1,5 @@
-perl mysql-test-run.pl --timer --force --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --comment=embedded --embedded --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
-perl mysql-test-run.pl --timer --force --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=2 --comment=n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=2 --comment=ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=2 --comment=embedded --embedded --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=2 --comment=rpl_binlog_row --suite=rpl,binlog --mysqld=--binlog-format=row --experimental=collections/default.experimental
+perl mysql-test-run.pl --timer --force --parallel=2 --comment=funcs_1 --suite=funcs_1 --experimental=collections/default.experimental

=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2009-04-23 11:35:02 +0000
+++ b/mysql-test/lib/mtr_report.pm	2009-05-28 11:02:03 +0000
@@ -71,6 +71,8 @@ sub _mtr_report_test_name ($) {
 
   print _name(), _timestamp();
   printf "%-40s ", $tname;
+  my $worker = $tinfo->{worker};
+  printf "w$worker " if $worker;
 
   return $tname;
 }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-05-12 12:53:46 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-05-28 11:02:03 +0000
@@ -723,6 +723,8 @@ sub run_worker ($) {
       delete($test->{'comment'});
       delete($test->{'logfile'});
 
+      $test->{worker} = $thread_num if $opt_parallel > 1;
+
       run_testcase($test);
       #$test->{result}= 'MTR_RES_PASSED';
       # Send it back, now with results set

Thread
bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2798) Bug#43659Bjorn Munch28 May