diff options
Diffstat (limited to 'deps/openssl/openssl/test/run_tests.pl')
| -rw-r--r-- | deps/openssl/openssl/test/run_tests.pl | 110 |
1 files changed, 70 insertions, 40 deletions
diff --git a/deps/openssl/openssl/test/run_tests.pl b/deps/openssl/openssl/test/run_tests.pl index 77dffb332b..881feaec71 100644 --- a/deps/openssl/openssl/test/run_tests.pl +++ b/deps/openssl/openssl/test/run_tests.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -19,16 +19,17 @@ use File::Basename; use FindBin; use lib "$FindBin::Bin/../util/perl"; use OpenSSL::Glob; -use Module::Load::Conditional qw(can_load); -my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) - ? 'TAP::Harness' : 'OpenSSL::TAP::Harness'; +my $TAP_Harness = eval { require TAP::Harness } ? "TAP::Harness" + : "OpenSSL::TAP::Harness"; my $srctop = $ENV{SRCTOP} || $ENV{TOP}; my $bldtop = $ENV{BLDTOP} || $ENV{TOP}; my $recipesdir = catdir($srctop, "test", "recipes"); my $libdir = rel2abs(catdir($srctop, "util", "perl")); +$ENV{OPENSSL_CONF} = catdir($srctop, "apps", "openssl.cnf"); + my %tapargs = ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0, lib => [ $libdir ], @@ -36,45 +37,74 @@ my %tapargs = merge => 1 ); -my @tests = ( "alltests" ); -if (@ARGV) { - @tests = @ARGV; -} -my $list_mode = scalar(grep /^list$/, @tests) != 0; -if (grep /^(alltests|list)$/, @tests) { - @tests = grep { - basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/ - } glob(catfile($recipesdir,"*.t")); -} else { - my @t = (); - foreach (@tests) { - push @t, grep { - basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/ - } glob(catfile($recipesdir,"*-$_.t")); +my @alltests = find_matching_tests("*"); +my %tests = (); + +my $initial_arg = 1; +foreach my $arg (@ARGV ? @ARGV : ('alltests')) { + if ($arg eq 'list') { + foreach (@alltests) { + (my $x = basename($_)) =~ s|^[0-9][0-9]-(.*)\.t$|$1|; + print $x,"\n"; + } + exit 0; + } + if ($arg eq 'alltests') { + warn "'alltests' encountered, ignoring everything before that...\n" + unless $initial_arg; + %tests = map { $_ => 1 } @alltests; + } elsif ($arg =~ m/^(-?)(.*)/) { + my $sign = $1; + my $test = $2; + my @matches = find_matching_tests($test); + + # If '-foo' is the first arg, it's short for 'alltests -foo' + if ($sign eq '-' && $initial_arg) { + %tests = map { $_ => 1 } @alltests; + } + + if (scalar @matches == 0) { + warn "Test $test found no match, skipping ", + ($sign eq '-' ? "removal" : "addition"), + "...\n"; + } else { + foreach $test (@matches) { + if ($sign eq '-') { + delete $tests{$test}; + } else { + $tests{$test} = 1; + } + } + } + } else { + warn "I don't know what '$arg' is about, ignoring...\n"; } - @tests = @t; + + $initial_arg = 0; } -if ($list_mode) { - @tests = map { $_ = basename($_); $_ =~ s/^[0-9][0-9]-//; $_ =~ s/\.t$//; - $_ } @tests; - print join("\n", @tests), "\n"; -} else { - @tests = map { abs2rel($_, rel2abs(curdir())); } @tests; - - my $harness = $TAP_Harness->new(\%tapargs); - my $ret = $harness->runtests(sort @tests); - - # $ret->has_errors may be any number, not just 0 or 1. On VMS, numbers - # from 2 and on are used as is as VMS statuses, which has severity encoded - # in the lower 3 bits. 0 and 1, on the other hand, generate SUCCESS and - # FAILURE, so for currect reporting on all platforms, we make sure the only - # exit codes are 0 and 1. Double-bang is the trick to do so. - exit !!$ret->has_errors if (ref($ret) eq "TAP::Parser::Aggregator"); - - # If this isn't a TAP::Parser::Aggregator, it's the pre-TAP test harness, - # which simply dies at the end if any test failed, so we don't need to - # bother with any exit code in that case. +my $harness = $TAP_Harness->new(\%tapargs); +my $ret = $harness->runtests(map { abs2rel($_, rel2abs(curdir())); } + sort keys %tests); + +# $ret->has_errors may be any number, not just 0 or 1. On VMS, numbers +# from 2 and on are used as is as VMS statuses, which has severity encoded +# in the lower 3 bits. 0 and 1, on the other hand, generate SUCCESS and +# FAILURE, so for currect reporting on all platforms, we make sure the only +# exit codes are 0 and 1. Double-bang is the trick to do so. +exit !!$ret->has_errors if (ref($ret) eq "TAP::Parser::Aggregator"); + +# If this isn't a TAP::Parser::Aggregator, it's the pre-TAP test harness, +# which simply dies at the end if any test failed, so we don't need to bother +# with any exit code in that case. + +sub find_matching_tests { + my ($glob) = @_; + + if ($glob =~ m|^[\d\[\]\?\-]+$|) { + return glob(catfile($recipesdir,"$glob-*.t")); + } + return glob(catfile($recipesdir,"*-$glob.t")); } |