summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 12:06:50 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 12:06:50 +0300
commitec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (patch)
tree751af6227789bfa916a6de426542a966845c8cd1 /mysql-test/mysql-test-run.pl
parentba0ee91077d9b89296328892aa5d5d293f4e0fb1 (diff)
parentb337a0682943fa7e055380b7859762acf7fb588c (diff)
downloadmariadb-git-ec6042bda097fa53c43caf4a1acc32c5a77f6ed4.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 489af28c07f..ac9f493dc84 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -742,8 +742,7 @@ sub run_test_server ($$$) {
# Repeat test $opt_repeat number of times
my $repeat= $result->{repeat} || 1;
- # Don't repeat if test was skipped
- if ($repeat < $opt_repeat && $result->{'result'} ne 'MTR_RES_SKIPPED')
+ if ($repeat < $opt_repeat)
{
$result->{retries}= 0;
$result->{rep_failures}++ if $result->{failures};
@@ -5818,7 +5817,7 @@ sub debugger_arguments {
$$exe= $debugger;
}
- elsif ( $debugger =~ /windbg/ )
+ elsif ( $debugger =~ /windbg|vsjitdebugger/ )
{
# windbg exe arg1 .. argn