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

Bug #42988 MTR2's --help output does not document --parallel

Browse Source 
Several options were not documented
Added missing options and removed a few
Fixed use of --skip-combinations
This commit is contained in:
Bjorn Munch
2009-05-12 14:53:46 +02:00
parent 3e6f1f2763
commit 82f3628eca
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/lib/mtr_cases.pm
View File

@ -33,7 +33,7 @@ our $print_testcases;
our $skip_rpl; our $skip_rpl;
our $do_test; our $do_test;
our $skip_test; our $skip_test;
our $opt_skip_combination; our $skip_combinations;
our $binlog_format; our $binlog_format;
our $enable_disabled; our $enable_disabled;
our $default_storage_engine; our $default_storage_engine;
@ -386,7 +386,7 @@ sub collect_one_suite($)
# Read combinations for this suite and build testcases x combinations # Read combinations for this suite and build testcases x combinations
# if any combinations exists # if any combinations exists
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if ( ! $opt_skip_combination ) if ( ! $skip_combinations )
{ {
my @combinations; my @combinations;
my $combination_file= "$suitedir/combinations"; my $combination_file= "$suitedir/combinations";

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

@ -5063,10 +5063,13 @@ Options to control what engine/variation to run
vs-config Visual Studio configuration used to create executables vs-config Visual Studio configuration used to create executables
(default: MTR_VS_CONFIG environment variable) (default: MTR_VS_CONFIG environment variable)
config|defaults-file=<config template> Use fixed config template for all defaults-file=<config template> Use fixed config template for all
tests tests
defaults_extra_file=<config template> Extra config template to add to defaults_extra_file=<config template> Extra config template to add to
all generated configs all generated configs
combination=<opt> Use at least twice to run tests with specified
options to mysqld
skip-combinations Ignore combination file (or options)
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
@ -5089,7 +5092,6 @@ Options to control what test suites or cases to run
force Continue to run the suite after failure force Continue to run the suite after failure
with-ndbcluster-only Run only tests that include "ndb" in the filename with-ndbcluster-only Run only tests that include "ndb" in the filename
skip-ndb[cluster] Skip all tests that need cluster skip-ndb[cluster] Skip all tests that need cluster
skip-ndb[cluster]-slave Skip all tests that need a slave cluster
do-test=PREFIX or REGEX do-test=PREFIX or REGEX
Run test cases which name are prefixed with PREFIX Run test cases which name are prefixed with PREFIX
or fulfills REGEX or fulfills REGEX
@ -5104,6 +5106,9 @@ Options to control what test suites or cases to run
The default is: "$DEFAULT_SUITES" The default is: "$DEFAULT_SUITES"
skip-rpl Skip the replication test cases. skip-rpl Skip the replication test cases.
big-test Also run tests marked as "big" big-test Also run tests marked as "big"
enable-disabled Run also tests marked as disabled
print_testcases Don't run the tests but print details about all the
selected tests, in the order they would be run.
Options that specify ports Options that specify ports
@ -5172,7 +5177,7 @@ Options for valgrind
valgrind-options=ARGS Deprecated, use --valgrind-option valgrind-options=ARGS Deprecated, use --valgrind-option
valgrind-option=ARGS Option to give valgrind, replaces default option(s), valgrind-option=ARGS Option to give valgrind, replaces default option(s),
can be specified more then once can be specified more then once
valgrind-path=[EXE] Path to the valgrind executable valgrind-path=<EXE> Path to the valgrind executable
callgrind Instruct valgrind to use callgrind callgrind Instruct valgrind to use callgrind
Misc options Misc options
@ -5180,6 +5185,7 @@ Misc options
comment=STR Write STR to the output comment=STR Write STR to the output
notimer Don't show test case execution time notimer Don't show test case execution time
verbose More verbose output(use multiple times for even more) verbose More verbose output(use multiple times for even more)
verbose-restart Write when and why servers are restarted
start Only initialize and start the servers, using the start Only initialize and start the servers, using the
startup settings for the first specified test case startup settings for the first specified test case
Example: Example:
@ -5190,6 +5196,7 @@ Misc options
servers to exit before finishing the process servers to exit before finishing the process
fast Run as fast as possible, dont't wait for servers fast Run as fast as possible, dont't wait for servers
to shutdown etc. to shutdown etc.
parallel=N Run tests in N parallel threads (default=1)
repeat=N Run each test N number of times repeat=N Run each test N number of times
retry=N Retry tests that fail N times, limit number of failures retry=N Retry tests that fail N times, limit number of failures
to $opt_retry_failure to $opt_retry_failure
@ -5207,6 +5214,12 @@ Misc options
sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time sleep=SECONDS Passed to mysqltest, will be used as fixed sleep time
gcov Collect coverage information after the test. gcov Collect coverage information after the test.
The result is a gcov file per source and header file. The result is a gcov file per source and header file.
experimental=<file> Refer to list of tests considered experimental;
failures will be marked exp-fail instead of fail.
report-features First run a "test" that reports mysql features
timestamp Print timestamp before each test report line
timediff With --timestamp, also print time passed since
*previous* test started
HERE HERE
exit(1); exit(1);