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

make cms-test.pl consistent with other branches

Browse Source
This commit is contained in:
Dr. Stephen Henson
2010-05-20 17:33:25 +00:00
parent a7949b8da3
commit a89b665b9b
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/cms-test.pl
View File

@@ -54,13 +54,13 @@
# OpenSSL PKCS#7 and CMS implementations. # OpenSSL PKCS#7 and CMS implementations.
my $ossl_path; my $ossl_path;
my $redir = " 2>cms.err 1>cms.out";
if ( -f "../apps/openssl" ) { # 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"; $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
} }
elsif ( -f "../apps/openssl.exe" ) {
$ossl_path = "../util/shlib_wrap.sh ../apps/openssl.exe";
}
elsif ( -f "..\\out32dll\\openssl.exe" ) { elsif ( -f "..\\out32dll\\openssl.exe" ) {
$ossl_path = "..\\out32dll\\openssl.exe"; $ossl_path = "..\\out32dll\\openssl.exe";
} }
@@ -336,10 +336,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"; print "CMS => PKCS#7 compatibility tests\n";
run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $cmscmd, $pk7cmd ); run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $cmscmd, $pk7cmd );
@@ -389,14 +385,14 @@ sub run_smime_tests {
$rscmd =~ s/-stream//; $rscmd =~ s/-stream//;
$rvcmd =~ s/-stream//; $rvcmd =~ s/-stream//;
} }
system("$scmd$rscmd 2>cms.err 1>cms.out"); system("$scmd$rscmd$redir");
if ($?) { if ($?) {
print "$tnam: generation error\n"; print "$tnam: generation error\n";
$$rv++; $$rv++;
exit 1 if $halt_err; exit 1 if $halt_err;
next; next;
} }
system("$vcmd$rvcmd 2>cms.err 1>cms.out"); system("$vcmd$rvcmd$redir");
if ($?) { if ($?) {
print "$tnam: verify error\n"; print "$tnam: verify error\n";
$$rv++; $$rv++;