From b9b60d6f2d5df85563dd48df3fc72b5c2601f584 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Feb 2008 23:15:37 +0100 Subject: [PATCH] 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. --- storage/maria/unittest/ma_test_recovery.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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";