← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Brian Aker
  • Date: 2011-01-13 23:13:17 UTC
  • mfrom: (2070.3.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2082.
  • Revision ID: brian@gir-3-20110113231317-all14xgl7735jt2d
Merge in rabbitmq patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
230
230
our $opt_slave_myport;
231
231
our $opt_memc_myport;
232
232
our $opt_pbms_myport;
 
233
our $opt_rabbitmq_myport;
233
234
our $opt_record;
234
235
my $opt_report_features;
235
236
our $opt_check_testcases;
508
509
             'slave_port=i'             => \$opt_slave_myport,
509
510
             'memc_port=i'              => \$opt_memc_myport,
510
511
             'pbms_port=i'              => \$opt_pbms_myport,
 
512
             'rabbitmq_port=i'              => \$opt_rabbitmq_myport,
511
513
             'dtr-build-thread=i'       => \$opt_dtr_build_thread,
512
514
 
513
515
             # Test case authoring
1141
1143
  $opt_slave_myport=          gimme_a_good_port($opt_master_myport + 2);  # and 3 4
1142
1144
  $opt_memc_myport= gimme_a_good_port($opt_master_myport + 10);
1143
1145
  $opt_pbms_myport= gimme_a_good_port($opt_master_myport + 11);
 
1146
  $opt_rabbitmq_myport= gimme_a_good_port($opt_master_myport + 12);
1144
1147
 
1145
1148
  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
1146
1149
  {
1470
1473
  $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
1471
1474
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
1472
1475
  $ENV{'MC_PORT'}=            $opt_memc_myport;
1473
 
  $ENV{'PBMS_PORT'}=            $opt_pbms_myport;
1474
 
  $ENV{'DRIZZLE_TCP_PORT'}=     $drizzled_variables{'drizzle-protocol.port'};
 
1476
  $ENV{'PBMS_PORT'}=          $opt_pbms_myport;
 
1477
  $ENV{'RABBITMQ_NODE_PORT'}= $opt_rabbitmq_myport;
 
1478
  $ENV{'DRIZZLE_TCP_PORT'}=   $drizzled_variables{'drizzle-protocol.port'};
1475
1479
 
1476
1480
  $ENV{'DTR_BUILD_THREAD'}=      $opt_dtr_build_thread;
1477
1481
 
1629
1633
    print "Using SLAVE_MYPORT2         = $ENV{SLAVE_MYPORT2}\n";
1630
1634
    print "Using MC_PORT               = $ENV{MC_PORT}\n";
1631
1635
    print "Using PBMS_PORT             = $ENV{PBMS_PORT}\n";
 
1636
    print "Using RABBITMQ_NODE_PORT    = $ENV{RABBITMQ_NODE_PORT}\n";
1632
1637
  }
1633
1638
 
1634
1639
  # Create an environment variable to make it possible