generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update cms-test.pl to handle some Unix like Windows environments where

Browse Source 
calling shlib_wrap.sh doesn't work.
This commit is contained in:
Dr. Stephen Henson 2010-05-20 17:28:37 +00:00
parent 7837c7ec45
commit fdce8a355f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/cms-test.pl
View File

@ -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++;