projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/recipes/02-test_ordinals.t: Take '?' and '?+' into account
[openssl.git]
/
test
/
recipes
/
02-test_ordinals.t
diff --git
a/test/recipes/02-test_ordinals.t
b/test/recipes/02-test_ordinals.t
index 473d05b01446182f745c7f352913bd0e72342f51..710e7e23240f14978eaf150dc19b49bc7f76ecff 100644
(file)
--- a/
test/recipes/02-test_ordinals.t
+++ b/
test/recipes/02-test_ordinals.t
@@
-1,7
+1,7
@@
#! /usr/bin/env perl
# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
#
#! /usr/bin/env perl
# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
#
-# Licensed under the
OpenSSL license
(the "License"). You may not use
+# Licensed under the
Apache License 2.0
(the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
@@
-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;
#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;
|| $qualifier eq ""))) {
print STDERR "Invalid ordinal detected: ".$tokens[1]."\n";
$ret = 0;