mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
calculate build thread earlier
Always set MTR_BUILD_THREAD env variable
This commit is contained in:
@ -381,6 +381,11 @@ sub command_line_setup {
|
|||||||
|
|
||||||
usage("") if $opt_usage;
|
usage("") if $opt_usage;
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Check mtr_build_thread and calculate baseport
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
set_mtr_build_thread_ports($opt_mtr_build_thread);
|
||||||
|
|
||||||
if ( -d "../sql" )
|
if ( -d "../sql" )
|
||||||
{
|
{
|
||||||
$source_dist= 1;
|
$source_dist= 1;
|
||||||
@ -732,11 +737,6 @@ sub command_line_setup {
|
|||||||
$path_current_test_log= "$opt_vardir/log/current_test";
|
$path_current_test_log= "$opt_vardir/log/current_test";
|
||||||
$path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";
|
$path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
|
||||||
# Check mtr_build_thread and calculate baseport
|
|
||||||
# --------------------------------------------------------------------------
|
|
||||||
set_mtr_build_thread_ports($opt_mtr_build_thread);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -765,6 +765,7 @@ sub set_mtr_build_thread_ports($) {
|
|||||||
print "got ".$mtr_build_thread."\n";
|
print "got ".$mtr_build_thread."\n";
|
||||||
}
|
}
|
||||||
$opt_mtr_build_thread= $mtr_build_thread;
|
$opt_mtr_build_thread= $mtr_build_thread;
|
||||||
|
$ENV{MTR_BUILD_THREAD}= $mtr_build_thread;
|
||||||
|
|
||||||
# Calculate baseport
|
# Calculate baseport
|
||||||
$opt_baseport= $mtr_build_thread * 10 + 10000;
|
$opt_baseport= $mtr_build_thread * 10 + 10000;
|
||||||
|
Reference in New Issue
Block a user