summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-11-04 11:41:01 +0100
committerRichard Levitte <levitte@openssl.org>2019-11-05 22:44:21 +0100
commit6af1b11848f000c900877f1289a42948d415f21c (patch)
tree4229adb1518b3392f723251e21cde0080c3e7cdd
parentb6fc6620cff7e5971757ad1c50edd022fdaffc04 (diff)
test/recipes/02-test_ordinals.t: Take '?' and '?+' into account
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10348)
-rw-r--r--test/recipes/02-test_ordinals.t7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/recipes/02-test_ordinals.t b/test/recipes/02-test_ordinals.t
index 16d3877451..710e7e2324 100644
--- a/test/recipes/02-test_ordinals.t
+++ b/test/recipes/02-test_ordinals.t
@@ -41,8 +41,11 @@ sub testordinals
#Some ordinals can be repeated, e.g. if one is VMS and another is !VMS
$newqual = $tokens[4];
$newqual =~ s/!//g;
- if ($cnt > $tokens[1]
- || ($cnt == $tokens[1] && ($qualifier ne $newqual
+ my $number = $tokens[1];
+ $number = $cnt + 1 if $number eq '?';
+ $number = $cnt if $number eq '?+';
+ if ($cnt > $number
+ || ($cnt == $number && ($qualifier ne $newqual
|| $qualifier eq ""))) {
print STDERR "Invalid ordinal detected: ".$tokens[1]."\n";
$ret = 0;