mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge from 5.5-mtr
This commit is contained in:
@ -111,6 +111,9 @@ sub collect_test_cases ($$$$) {
|
||||
my $opt_skip_test_list= shift;
|
||||
my $cases= []; # Array of hash(one hash for each testcase)
|
||||
|
||||
# Unit tests off by default also if using --do-test or --start-from
|
||||
$::opt_ctest= 0 if $::opt_ctest == -1 && ($do_test || $start_from);
|
||||
|
||||
$do_test_reg= init_pattern($do_test, "--do-test");
|
||||
$skip_test_reg= init_pattern($skip_test, "--skip-test");
|
||||
|
||||
|
@ -197,7 +197,7 @@ our $opt_debug_server;
|
||||
our @opt_cases; # The test cases names in argv
|
||||
our $opt_embedded_server;
|
||||
# -1 indicates use default, override with env.var.
|
||||
my $opt_ctest= env_or_val(MTR_UNIT_TESTS => -1);
|
||||
our $opt_ctest= env_or_val(MTR_UNIT_TESTS => -1);
|
||||
# Unit test report stored here for delayed printing
|
||||
my $ctest_report;
|
||||
|
||||
|
Reference in New Issue
Block a user