diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-08 11:14:42 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-08 11:14:42 +0200 |
| commit | 0aca4f0011b8f13b482930f4b8088cdc4c8ab3b6 (patch) | |
| tree | 81b9ade05390ba5d52c2aacf29248e960e0f6e9f /mysql-test | |
| parent | fabde82dbd0d4281421ee414603640659c9ab8aa (diff) | |
| download | mariadb-git-0aca4f0011b8f13b482930f4b8088cdc4c8ab3b6.tar.gz | |
Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode
Disallow (and don't use) space in combination names
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 4 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 76ad5eec4e0..eabc981d54a 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -539,11 +539,11 @@ sub collect_one_suite($) push(@{$new_test->{slave_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename"); if ($new_test->{combination}) { - $new_test->{combination}.= ' + InnoDB plugin'; + $new_test->{combination}.= '+innodb_plugin'; } else { - $new_test->{combination}= 'InnoDB plugin'; + $new_test->{combination}= 'innodb_plugin'; } push(@new_cases, $new_test); } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 846f307ea97..46a6d5af4bc 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3247,6 +3247,12 @@ sub run_testcase ($) { mtr_verbose("Running test:", $tinfo->{name}); + # Allow only alpanumerics pluss _ - + . in combination names + my $combination= $tinfo->{combination}; + if ($combination && $combination !~ /^\w[\w-\.\+]+$/) + { + mtr_error("Combination '$combination' contains illegal characters"); + } # ------------------------------------------------------- # Init variables that can change between each test case # ------------------------------------------------------- |