database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixup mtr_unique. Remove usage of ps and grep. Make it a module. Move _process_alive to Platform.pm. Rename opt_baseport to baseport, it's not an option

Browse Source
This commit is contained in:
Magnus Svensson
2008-08-10 19:46:43 +02:00
parent 552d514d0b
commit c431b23bae
5 changed files with 209 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/mysql-test-run.pl
View File

@ -53,6 +53,7 @@ use My::SysInfo;
use mtr_cases;
use mtr_report;
use mtr_match;
use mtr_unique;
use IO::Socket::INET;
use IO::Select;
@ -60,7 +61,6 @@ require "lib/mtr_process.pl";
require "lib/mtr_io.pl";
require "lib/mtr_gcov.pl";
require "lib/mtr_misc.pl";
require "lib/mtr_unique.pl";
$SIG{INT}= sub { mtr_error("Got ^C signal"); };
@ -143,7 +143,7 @@ our $opt_client_debugger;
my $config; # The currently running config
my $current_config_name; # The currently running config file template
my $opt_baseport;
my $baseport;
my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto";
my $opt_record;
@ -1181,24 +1181,26 @@ sub set_build_thread_ports($) {
if ( lc($build_thread) eq 'auto' ) {
mtr_report("Requesting build thread... ");
$build_thread=
mtr_require_unique_id_and_wait("/tmp/mysql-test-ports", 200, 299);
$build_thread= mtr_get_unique_id(200, 299);
if ( !defined $build_thread ) {
mtr_error("Could not get a unique build thread id");
}
mtr_report(" - got $build_thread");
}
$ENV{MTR_BUILD_THREAD}= $build_thread;
$opt_build_thread= $build_thread;
# Calculate baseport
$opt_baseport= $build_thread * 10 + 10000;
if ( $opt_baseport < 5001 or $opt_baseport + 9 >= 32767 )
$baseport= $build_thread * 10 + 10000;
if ( $baseport < 5001 or $baseport + 9 >= 32767 )
{
mtr_error("MTR_BUILD_THREAD number results in a port",
"outside 5001 - 32767",
"($opt_baseport - $opt_baseport + 9)");
"($baseport - $baseport + 9)");
}
mtr_report("Using MTR_BUILD_THREAD $build_thread,",
"with reserved ports $opt_baseport..".($opt_baseport+9));
"with reserved ports $baseport..".($baseport+9));
}
@ -2286,7 +2288,7 @@ sub kill_leftovers ($) {
sub check_ports_free
{
my @ports_to_check;
for ($opt_baseport..$opt_baseport+9){
for ($baseport..$baseport+9){
push(@ports_to_check, $_);
}
mtr_report("Checking ports...");
@ -2931,7 +2933,7 @@ sub run_testcase ($) {
extra_template_path => $tinfo->{extra_template_path},
vardir => $opt_vardir,
tmpdir => $opt_tmpdir,
baseport => $opt_baseport,
baseport => $baseport,
#hosts => [ 'host1', 'host2' ],
user => $opt_user,
password => '',