diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-04-15 10:37:20 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-04-15 10:37:20 +0200 |
| commit | 34a312a7a5ccd883bea4624f30a444358e174bb3 (patch) | |
| tree | 162baff0c5076ea7e22365158780d8b2c4f932cc /mysql-test | |
| parent | 255986a511d07b90cc2ab81579ef25aba7c8b48c (diff) | |
| parent | c95227ca54c291d372e1136d52a0ecc9eb0294cf (diff) | |
| download | mariadb-git-34a312a7a5ccd883bea4624f30a444358e174bb3.tar.gz | |
upmerge 12351213,12360195
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/My/Find.pm | 5 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 521adecfd13..9d1d2915012 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2008 MySQL AB +# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -156,8 +156,7 @@ sub my_find_paths { # User can select to look in a special build dir # which is a subdirectory of any of the paths my @extra_dirs; - my $build_dir= $::opt_config_dir || $ENV{MTR_VS_CONFIG} - || $ENV{MTR_BUILD_DIR}; + my $build_dir= $::opt_vs_config || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR}; push(@extra_dirs, $build_dir) if defined $build_dir; if (defined $extension){ diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2097bc8f63a..99454c3c764 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1198,7 +1198,7 @@ sub command_line_setup { chomp; # remove comments (# foo) at the beginning of the line, or after a # blank at the end of the line - s/( +|^)#.*$//; + s/(\s+|^)#.*$//; # If @ platform specifier given, use this entry only if it contains # @<platform> or @!<xxx> where xxx != platform if (/\@.*/) @@ -1209,8 +1209,8 @@ sub command_line_setup { s/\@.*$//; } # remove whitespace - s/^ +//; - s/ +$//; + s/^\s+//; + s/\s+$//; # if nothing left, don't need to remember this line if ( $_ eq "" ) { next; |