diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 11:59:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-07 11:59:26 +0300 |
| commit | ee844f6c346ffa009dda2fcb0588ae430479c71d (patch) | |
| tree | 39c0b9d4c28a0b9990d52a29aeed32a38042f74b | |
| parent | 3ec8268b4a328dd755414adce5cf14ebdac5677e (diff) | |
| download | mariadb-git-ee844f6c346ffa009dda2fcb0588ae430479c71d.tar.gz | |
Make the SEARCH_ABORT logic actually work
The SEARCH_ABORT logic was not working as intended
(tests were not being aborted).
| -rw-r--r-- | mysql-test/include/search_pattern_in_file++.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/search_pattern_in_file++.inc b/mysql-test/include/search_pattern_in_file++.inc index 3c5529989bb..21192b55efb 100644 --- a/mysql-test/include/search_pattern_in_file++.inc +++ b/mysql-test/include/search_pattern_in_file++.inc @@ -76,5 +76,6 @@ perl; my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND"; $ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1}; print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n"; - exit $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/; + die "$ENV{SEARCH_ABORT}\n" + if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/; EOF |