Commit b9b60d6f authored by unknown's avatar unknown

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.
parent b35c0fbc
...@@ -42,7 +42,7 @@ sub main ...@@ -42,7 +42,7 @@ sub main
} }
usage() if ($opt_help || $flag_exit); 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"; $maria_exe_path= "$maria_path/release";
# we use -f, sometimes -x is unexpectedly false in Cygwin # we use -f, sometimes -x is unexpectedly false in Cygwin
if ( ! -f "$maria_exe_path/ma_test1$suffix" ) if ( ! -f "$maria_exe_path/ma_test1$suffix" )
...@@ -68,6 +68,10 @@ sub main ...@@ -68,6 +68,10 @@ sub main
{ {
$md5sum="md5sum"; $md5sum="md5sum";
} }
elsif (defined(my_which("md5")))
{
$md5sum="md5";
}
elsif (defined(my_which("digest"))) elsif (defined(my_which("digest")))
{ {
$md5sum="digest -a md5"; $md5sum="digest -a md5";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment