From 6af1b11848f000c900877f1289a42948d415f21c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 4 Nov 2019 11:41:01 +0100 Subject: [PATCH 1/1] test/recipes/02-test_ordinals.t: Take '?' and '?+' into account Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/10348) --- test/recipes/02-test_ordinals.t | 7 +++++-- 1 file 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; -- 2.34.1