summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot4.local>2008-02-21 23:15:37 +0100
committerunknown <guilhem@gbichot4.local>2008-02-21 23:15:37 +0100
commitb9b60d6f2d5df85563dd48df3fc72b5c2601f584 (patch)
treea5de58c1ec0d3343899ae6523d69dc6076018408
parentb35c0fbc0d3625febf5445419ee11fdc79cda3ff (diff)
downloadmariadb-git-b9b60d6f2d5df85563dd48df3fc72b5c2601f584.tar.gz
Fixes for ma_test_recovery.pl on OS X.
storage/maria/unittest/ma_test_recovery.pl: .exe is for win32, win64, cygwin but not darwin. Some OS X machines have md5 instead of md5sum.
-rwxr-xr-xstorage/maria/unittest/ma_test_recovery.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/maria/unittest/ma_test_recovery.pl b/storage/maria/unittest/ma_test_recovery.pl
index ccebf01910d..b08039c8da9 100755
--- a/storage/maria/unittest/ma_test_recovery.pl
+++ b/storage/maria/unittest/ma_test_recovery.pl
@@ -42,7 +42,7 @@ sub main
}
usage() if ($opt_help || $flag_exit);
- $suffix= ( $^O =~ /win/i ) ? ".exe" : "";
+ $suffix= ( $^O =~ /win/i && $^O !~ /darwin/i ) ? ".exe" : "";
$maria_exe_path= "$maria_path/release";
# we use -f, sometimes -x is unexpectedly false in Cygwin
if ( ! -f "$maria_exe_path/ma_test1$suffix" )
@@ -68,6 +68,10 @@ sub main
{
$md5sum="md5sum";
}
+ elsif (defined(my_which("md5")))
+ {
+ $md5sum="md5";
+ }
elsif (defined(my_which("digest")))
{
$md5sum="digest -a md5";