Check the validity of MINFO
MINFO may be an old file lying around, which might have 00-check_testexes.t produce incorrect results. To make sure this doesn't happen, check the variable VERSION in it against the same variable in the top Makefile. Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
2511c12bf2
commit
53520ebe87
@ -8,13 +8,26 @@ use OpenSSL::Test qw/:DEFAULT top_file/;
|
|||||||
|
|
||||||
setup("check_testexes");
|
setup("check_testexes");
|
||||||
|
|
||||||
|
my $OpenSSL_ver = "";
|
||||||
|
my $Makefile = top_file("Makefile");
|
||||||
|
if (open(FH, $Makefile)) {
|
||||||
|
$OpenSSL_ver =
|
||||||
|
(map { chomp; s/^VERSION=([^\s]*)\s*$//; $1 } grep { /^VERSION=/ } <FH>)[0];
|
||||||
|
close FH;
|
||||||
|
}
|
||||||
|
|
||||||
my $MINFO = top_file("MINFO");
|
my $MINFO = top_file("MINFO");
|
||||||
|
|
||||||
plan skip_all => "because MINFO not found. If you want this test to run, please do 'perl util/mkfiles.pl > MINFO'"
|
plan skip_all => "because MINFO not found. If you want this test to run, please do 'perl util/mkfiles.pl > MINFO'"
|
||||||
unless open(FH,$MINFO);
|
unless open(FH,$MINFO);
|
||||||
|
|
||||||
|
my $MINFO_ver = "";
|
||||||
|
|
||||||
while(<FH>) {
|
while(<FH>) {
|
||||||
chomp;
|
chomp;
|
||||||
|
if (/^VERSION=([^\s]*)\s*$/) {
|
||||||
|
$MINFO_ver = $1;
|
||||||
|
}
|
||||||
last if /^RELATIVE_DIRECTORY=test$/;
|
last if /^RELATIVE_DIRECTORY=test$/;
|
||||||
}
|
}
|
||||||
while(<FH>) {
|
while(<FH>) {
|
||||||
@ -23,6 +36,9 @@ while(<FH>) {
|
|||||||
}
|
}
|
||||||
close FH;
|
close FH;
|
||||||
|
|
||||||
|
plan skip_all => "because MINFO is not from this OpenSSL version. If you want this test to run, please do 'perl util/mkfiles.pl > MINFO'"
|
||||||
|
unless $OpenSSL_ver eq $MINFO_ver;
|
||||||
|
|
||||||
s/^EXE=\s*//;
|
s/^EXE=\s*//;
|
||||||
s/\s*$//;
|
s/\s*$//;
|
||||||
my @expected_tests =
|
my @expected_tests =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user