aboutsummaryrefslogtreecommitdiff
path: root/openssl/test/cms-test.pl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
commitfef0b61e18b9c7475e4d6e67ddfc55db46573f4e (patch)
treed4c68ba5b80ca0748fb23f1c344e859efd79503f /openssl/test/cms-test.pl
parent243edb24f5179d93c849ea326fb489d3f846db71 (diff)
downloadvcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.gz
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.bz2
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.zip
Switched to openssl-1.0.0a
Diffstat (limited to 'openssl/test/cms-test.pl')
-rw-r--r--openssl/test/cms-test.pl12
1 files changed, 8 insertions, 4 deletions
diff --git a/openssl/test/cms-test.pl b/openssl/test/cms-test.pl
index 6ad788346..9c50dff3e 100644
--- a/openssl/test/cms-test.pl
+++ b/openssl/test/cms-test.pl
@@ -54,8 +54,12 @@
# 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 +386,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++;