Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode

Disallow (and don't use) space in combination names
This commit is contained in:
Bjorn Munch 2009-10-08 11:14:42 +02:00
parent fabde82dbd
commit 0aca4f0011
2 changed files with 8 additions and 2 deletions

View file

@ -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);
}

View file

@ -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
# -------------------------------------------------------