aboutsummaryrefslogtreecommitdiffstats
path: root/test/cms-test.pl
diff options
context:
space:
mode:
Diffstat (limited to 'test/cms-test.pl')
-rwxr-xr-xtest/cms-test.pl19
1 files changed, 8 insertions, 11 deletions
diff --git a/test/cms-test.pl b/test/cms-test.pl
index 5c87b3ad8428..9c50dff3e9a3 100755
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -54,12 +54,13 @@
# OpenSSL PKCS#7 and CMS implementations.
my $ossl_path;
-
-if ( -f "../apps/openssl" ) {
- $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
+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.exe" ) {
- $ossl_path = "../util/shlib_wrap.sh ../apps/openssl.exe";
+elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
+ $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
}
elsif ( -f "..\\out32dll\\openssl.exe" ) {
$ossl_path = "..\\out32dll\\openssl.exe";
@@ -336,10 +337,6 @@ my @smime_cms_comp_tests = (
);
-print "PKCS#7 <=> PKCS#7 consistency tests\n";
-
-run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $pk7cmd, $pk7cmd );
-
print "CMS => PKCS#7 compatibility tests\n";
run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $cmscmd, $pk7cmd );
@@ -389,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++;