From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 20 May 2010 17:28:37 +0000 (+0000)
Subject: Update cms-test.pl to handle some Unix like Windows environments where
X-Git-Tag: OpenSSL-fips-2_0-rc1~1095
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fdce8a355f6faf34f5470a8d3f99ed65ff1af838;p=oweals%2Fopenssl.git

Update cms-test.pl to handle some Unix like Windows environments where
calling shlib_wrap.sh doesn't work.
---

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 6ad7883464..e5122bfb19 100644
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -54,8 +54,11 @@
 # OpenSSL PKCS#7 and CMS implementations.
 
 my $ossl_path;
-
-if ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
+my $redir = " 2>cms.err 1>cms.out";
+# Make MSYS work
+if ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
+    $ossl_path = "cmd /c ..\\apps\\openssl";
+elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
     $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
 }
 elsif ( -f "..\\out32dll\\openssl.exe" ) {
@@ -382,14 +385,14 @@ sub run_smime_tests {
 		$rscmd =~ s/-stream//;	
 		$rvcmd =~ s/-stream//;
 		}
-        system("$scmd$rscmd 2>cms.err 1>cms.out");
+        system("$scmd$rscmd$redir");
         if ($?) {
             print "$tnam: generation error\n";
             $$rv++;
             exit 1 if $halt_err;
             next;
         }
-        system("$vcmd$rvcmd 2>cms.err 1>cms.out");
+        system("$vcmd$rvcmd$redir");
         if ($?) {
             print "$tnam: verify error\n";
             $$rv++;