summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-20 17:49:21 +0200
commit038b739c98009cf0b4b7b7c2c18421051abf79f2 (patch)
treec31b05bf35b15358f7b0a89cfd8b5b43e2901ad8 /mysql-test/mysql-test-run.pl
parent3c07d04580fe5f28ff8bdabd1249b8123d7da76b (diff)
parentae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (diff)
downloadmariadb-git-038b739c98009cf0b4b7b7c2c18421051abf79f2.tar.gz
Merge with MariaDB 5.1 and MySQL 5.1.61
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9ccfe5df054..40a6282e8ef 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -987,7 +987,7 @@ sub command_line_setup {
'skip-test=s' => \&collect_option,
'do-test=s' => \&collect_option,
'start-from=s' => \&collect_option,
- 'big-test' => \$opt_big_test,
+ 'big-test+' => \$opt_big_test,
'combination=s' => \@opt_combinations,
'skip-combinations' => \&collect_option,
'experimental=s' => \@opt_experimentals,
@@ -5996,7 +5996,8 @@ Options to control what test suites or cases to run
list of suite names.
The default is: "$DEFAULT_SUITES"
skip-rpl Skip the replication test cases.
- big-test Also run tests marked as "big"
+ big-test Also run tests marked as "big". Repeat this option
+ twice to run only "big" tests.
staging-run Run a limited number of tests (no slow tests). Used
for running staging trees with valgrind.
enable-disabled Run also tests marked as disabled