summaryrefslogtreecommitdiff
path: root/mysql-test/lib/mtr_misc.pl
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-03 12:32:05 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-03 12:32:05 +0100
commitd7d0568236a17180b82fdbf7b781fc44b0ffff10 (patch)
tree4b22a547bab1827bc3041ace71d3fdab5da34262 /mysql-test/lib/mtr_misc.pl
parentf337a747ef8185b316534606c420b97bc5fb31ce (diff)
downloadmariadb-git-d7d0568236a17180b82fdbf7b781fc44b0ffff10.tar.gz
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
mysql-test/lib/mtr_misc.pl: Update comments mysql-test/mysql-test-run.pl: Also need to look in "$glob_basedir/bin"
Diffstat (limited to 'mysql-test/lib/mtr_misc.pl')
-rw-r--r--mysql-test/lib/mtr_misc.pl41
1 files changed, 21 insertions, 20 deletions
diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl
index ea163eeba22..846ca25b725 100644
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) {
##############################################################################
-# Note - More specific paths should be given before less specific. For examle
-# /client/debug should be listed before /client
-
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
sub mtr_path_exists (@) {
foreach my $path ( @_ )
{
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) {
}
}
-# Note - More specific paths should be given before less specific. For examle
-# /client/debug should be listed before /client
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
sub mtr_script_exists (@) {
foreach my $path ( @_ )
{
@@ -109,17 +112,11 @@ sub mtr_script_exists (@) {
}
}
-sub mtr_file_exists (@) {
- foreach my $path ( @_ )
- {
- return $path if -e $path;
- }
- return "";
-}
-
-# Note - More specific paths should be given before less specific. For examle
-# /client/debug should be listed before /client
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
sub mtr_file_exists (@) {
foreach my $path ( @_ )
{
@@ -128,9 +125,11 @@ sub mtr_file_exists (@) {
return "";
}
-# Note - More specific paths should be given before less specific. For examle
-# /client/debug should be listed before /client
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
sub mtr_exe_maybe_exists (@) {
my @path= @_;
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
return "";
}
-# Note - More specific paths should be given before less specific. For examle
-# /client/debug should be listed before /client
+#
+# NOTE! More specific paths should be given before less specific.
+# For example /client/debug should be listed before /client
+#
sub mtr_exe_exists (@) {
my @path= @_;
if (my $path= mtr_exe_maybe_exists(@path))
@@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
my $from_dir= shift;
my $to_dir= shift;
-# mtr_verbose("Copying from $from_dir to $to_dir");
+ # mtr_verbose("Copying from $from_dir to $to_dir");
mkpath("$to_dir");
opendir(DIR, "$from_dir")