diff options
author | Matt Caswell <matt@openssl.org> | 2014-11-12 10:05:01 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-11-18 13:10:23 +0000 |
commit | 5a4a949904c1fead075f60f368077540a77eba75 (patch) | |
tree | 9be58597d4fc0c80c4c35ea2eff13baa0394ba86 /test/cms-test.pl | |
parent | ffa69c1ced35cfad9b96d5697b93b7892b553ceb (diff) |
Fixed cms-test.pl for no-ec2m
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'test/cms-test.pl')
-rw-r--r-- | test/cms-test.pl | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/test/cms-test.pl b/test/cms-test.pl index 46827f9124..b5145ad9c8 100644 --- a/test/cms-test.pl +++ b/test/cms-test.pl @@ -88,6 +88,7 @@ my $halt_err = 1; my $badcmd = 0; my $no_ec; +my $no_ec2m; my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/; system ("$ossl_path no-ec > $null_path"); @@ -103,7 +104,21 @@ else { die "Error checking for EC support\n"; } - + +system ("$ossl_path no-ec2m >/dev/null"); +if ($? == 0) + { + $no_ec2m = 1; + } +elsif ($? == 256) + { + $no_ec2m = 0; + } +else + { + die "Error checking for EC2M support\n"; + } + my @smime_pkcs7_tests = ( [ @@ -497,6 +512,11 @@ sub run_smime_tests { print "$tnam: skipped, EC disabled\n"; next; } + if ($no_ec2m && $tnam =~ /K-283/) + { + print "$tnam: skipped, EC2M disabled\n"; + next; + } system("$scmd$rscmd$redir"); if ($?) { print "$tnam: generation error\n"; |