← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Mark Atwood
  • Date: 2011-05-12 22:20:08 UTC
  • mfrom: (2283.4.17 json-interface)
  • Revision ID: me@mark.atwood.name-20110512222008-7facdn0qu7lsbm0g
merge lp:~stewart/drizzle/json-interface

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_json_server_myport;
233
234
our $opt_rabbitmq_myport;
234
235
our $opt_record;
235
236
my $opt_report_features;
509
510
             'slave_port=i'             => \$opt_slave_myport,
510
511
             'memc_port=i'              => \$opt_memc_myport,
511
512
             'pbms_port=i'              => \$opt_pbms_myport,
 
513
             'json_server_port=i'              => \$opt_json_server_myport,
512
514
             'rabbitmq_port=i'              => \$opt_rabbitmq_myport,
513
515
             'dtr-build-thread=i'       => \$opt_dtr_build_thread,
514
516
 
1171
1173
  $opt_memc_myport= gimme_a_good_port($opt_master_myport + 10);
1172
1174
  $opt_pbms_myport= gimme_a_good_port($opt_master_myport + 11);
1173
1175
  $opt_rabbitmq_myport= gimme_a_good_port($opt_master_myport + 12);
 
1176
  $opt_json_server_myport= gimme_a_good_port($opt_master_myport + 13);
1174
1177
 
1175
1178
  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
1176
1179
  {
1501
1504
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
1502
1505
  $ENV{'MC_PORT'}=            $opt_memc_myport;
1503
1506
  $ENV{'PBMS_PORT'}=          $opt_pbms_myport;
 
1507
  $ENV{'JSON_SERVER_PORT'}=          $opt_json_server_myport;
1504
1508
  $ENV{'RABBITMQ_NODE_PORT'}= $opt_rabbitmq_myport;
1505
1509
  $ENV{'DRIZZLE_TCP_PORT'}=   $drizzled_variables{'drizzle-protocol.port'};
1506
1510
  $ENV{'DRIZZLE_TRX_READER'} = $opt_top_builddir.'/plugin/transaction_log/utilities/drizzletrx';
1662
1666
    print "Using MC_PORT               = $ENV{MC_PORT}\n";
1663
1667
    print "Using PBMS_PORT             = $ENV{PBMS_PORT}\n";
1664
1668
    print "Using RABBITMQ_NODE_PORT    = $ENV{RABBITMQ_NODE_PORT}\n";
 
1669
    print "Using JSON_SERVER_PORT      = $ENV{JSON_SERVER_PORT}\n";
1665
1670
  }
1666
1671
 
1667
1672
  # Create an environment variable to make it possible