Commit 7ec57f22 authored by Sergei Golubchik's avatar Sergei Golubchik

add sequence and sql_discovery suites to the default list.

implement ./mtr --dry-run
parent 050d7d6d
...@@ -208,6 +208,8 @@ our @opt_mysqld_envs; ...@@ -208,6 +208,8 @@ our @opt_mysqld_envs;
my $opt_stress; my $opt_stress;
my $opt_dry_run;
my $opt_compress; my $opt_compress;
my $opt_ssl; my $opt_ssl;
my $opt_skip_ssl; my $opt_skip_ssl;
...@@ -347,7 +349,7 @@ my $exe_ndb_mgm; ...@@ -347,7 +349,7 @@ my $exe_ndb_mgm;
our %mysqld_variables; our %mysqld_variables;
our @optional_plugins; our @optional_plugins;
my $source_dist= 0; my $source_dist= -d "../sql";
my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5); my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20); my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20);
...@@ -375,6 +377,8 @@ sub main { ...@@ -375,6 +377,8 @@ sub main {
# directly before it executes them, like "make test-force-pl" in RPM builds. # directly before it executes them, like "make test-force-pl" in RPM builds.
mtr_report("Logging: $0 ", join(" ", @ARGV)); mtr_report("Logging: $0 ", join(" ", @ARGV));
$DEFAULT_SUITES.=",sequence,sql_discovery" if $source_dist;
command_line_setup(); command_line_setup();
# --help will not reach here, so now it's safe to assume we have binaries # --help will not reach here, so now it's safe to assume we have binaries
...@@ -420,6 +424,14 @@ sub main { ...@@ -420,6 +424,14 @@ sub main {
my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list); my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list);
mark_time_used('collect'); mark_time_used('collect');
if ($opt_dry_run)
{
for (@$tests) {
print $_->fullname(), "\n";
}
exit 0;
}
if ( $opt_report_features ) { if ( $opt_report_features ) {
# Put "report features" as the first test to run # Put "report features" as the first test to run
my $tinfo = My::Test->new my $tinfo = My::Test->new
...@@ -1237,6 +1249,7 @@ sub command_line_setup { ...@@ -1237,6 +1249,7 @@ sub command_line_setup {
'report-times' => \$opt_report_times, 'report-times' => \$opt_report_times,
'result-file' => \$opt_resfile, 'result-file' => \$opt_resfile,
'stress=s' => \$opt_stress, 'stress=s' => \$opt_stress,
'dry-run' => \$opt_dry_run,
'help|h' => \$opt_usage, 'help|h' => \$opt_usage,
# list-options is internal, not listed in help # list-options is internal, not listed in help
...@@ -1255,11 +1268,6 @@ sub command_line_setup { ...@@ -1255,11 +1268,6 @@ sub command_line_setup {
report_option('verbose', $opt_verbose); report_option('verbose', $opt_verbose);
} }
if ( -d "../sql" )
{
$source_dist= 1;
}
# Find the absolute path to the test directory # Find the absolute path to the test directory
$glob_mysql_test_dir= cwd(); $glob_mysql_test_dir= cwd();
if ($glob_mysql_test_dir =~ / /) if ($glob_mysql_test_dir =~ / /)
...@@ -6295,6 +6303,8 @@ Options to control what engine/variation to run ...@@ -6295,6 +6303,8 @@ Options to control what engine/variation to run
all generated configs all generated configs
combination=<opt> Use at least twice to run tests with specified combination=<opt> Use at least twice to run tests with specified
options to mysqld options to mysqld
dry-run Don't run any tests, print the list of tests
that were selected for execution
Options to control directories to use Options to control directories to use
tmpdir=DIR The directory where temporary files are stored tmpdir=DIR The directory where temporary files are stored
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment