X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Frun_tests.pl;h=bd83a6b98809f0fa938dc7a000ab4da90d83ca24;hb=5ea8afd368498101531c7e628507a17d1e0e122c;hp=7e61282f16cad6e69353b4f497ed8729d5faad38;hpb=25be5f44b81e1c45e15e689ba55713e455dfe624;p=oweals%2Fopenssl.git diff --git a/test/run_tests.pl b/test/run_tests.pl index 7e61282f16..bd83a6b988 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -1,45 +1,283 @@ -#! /usr/bin/perl +#! /usr/bin/env perl +# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved. +# +# 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 use strict; use warnings; +# Recognise VERBOSE and V which is common on other projects. +# Additionally, also recognise VERBOSE_FAILURE and VF. +BEGIN { + $ENV{HARNESS_VERBOSE} = "yes" if $ENV{VERBOSE} || $ENV{V}; + $ENV{HARNESS_VERBOSE_FAILURE} = "yes" if $ENV{VERBOSE_FAILURE} || $ENV{VF}; + $ENV{HARNESS_VERBOSE_FAILURES_ONLY} = "yes" + if $ENV{VERBOSE_FAILURES_ONLY} || $ENV{VFO}; + $ENV{HARNESS_VERBOSE_FAILURES_PROGRESS} = "yes" + if $ENV{VERBOSE_FAILURES_PROGRESS} || $ENV{VFP}; +} + use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/; use File::Basename; -use Test::Harness qw/runtests $switches/; - -my $top = $ENV{TOP}; -my $recipesdir = catdir($top, "test", "recipes"); -my $testlib = catdir($top, "test", "testlib"); -my $utillib = catdir($top, "util"); - -# It seems that $switches is getting interpretted with 'eval' or something -# like that, and that we need to take care of backslashes or they will -# disappear along the way. -$testlib =~ s|\\|\\\\|g if $^O eq "MSWin32"; -$utillib =~ s|\\|\\\\|g if $^O eq "MSWin32"; - -# Test::Harness provides the variable $switches to give it -# switches to be used when it calls our recipes. -$switches = "-w \"-I$testlib\" \"-I$utillib\""; - -my @tests = ( "alltests" ); -if (@ARGV) { - @tests = @ARGV; +use FindBin; +use lib "$FindBin::Bin/../util/perl"; +use OpenSSL::Glob; + +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} = rel2abs(catdir($srctop, "apps", "openssl.cnf")); +$ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "providers")); +$ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers")); +$ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines")); +$ENV{CTLOG_FILE} = rel2abs(catdir($srctop, "test", "ct", "log_list.cnf")); + +my %tapargs = + ( verbosity => $ENV{HARNESS_VERBOSE} ? 1 : 0, + lib => [ $libdir ], + switches => '-w', + merge => 1, + ); + +# Additional OpenSSL special TAP arguments. Because we can't pass them via +# TAP::Harness->new(), they will be accessed directly, see the +# TAP::Parser::OpenSSL implementation further down +my %openssl_args = (); + +$openssl_args{'failure_verbosity'} = $ENV{HARNESS_VERBOSE} ? 0 : + $ENV{HARNESS_VERBOSE_FAILURE} ? 3 : + $ENV{HARNESS_VERBOSE_FAILURES_PROGRESS} ? 2 : + $ENV{HARNESS_VERBOSE_FAILURES_ONLY} ? 1 : 0; + +my $outfilename = $ENV{HARNESS_TAP_COPY}; +open $openssl_args{'tap_copy'}, ">$outfilename" + or die "Trying to create $outfilename: $!\n" + if defined $outfilename; + +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 { $_ => basename($_) } @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 { $_ => basename($_) } @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} = basename($test); + } + } + } + } else { + warn "I don't know what '$arg' is about, ignoring...\n"; + } + + $initial_arg = 0; } -if (grep /^alltests$/, @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")); + +sub find_matching_tests { + my ($glob) = @_; + + if ($glob =~ m|^[\d\[\]\?\-]+$|) { + return glob(catfile($recipesdir,"$glob-*.t")); + } + return glob(catfile($recipesdir,"*-$glob.t")); +} + +# The following is quite a bit of hackery to adapt to both TAP::Harness +# and Test::Harness, depending on what's available. +# The TAP::Harness hack allows support for HARNESS_VERBOSE_FAILURE* and +# HARNESS_TAP_COPY, while the Test::Harness hack can't, because the pre +# TAP::Harness Test::Harness simply doesn't have support for this sort of +# thing. +# +# We use eval to avoid undue interruption if TAP::Harness isn't present. + +my $package; +my $eres; + +$eres = eval { + package TAP::Parser::OpenSSL; + use parent 'TAP::Parser'; + + sub new { + my $class = shift; + my %opts = %{ shift() }; + my $failure_verbosity = $openssl_args{failure_verbosity}; + print "\n" if $failure_verbosity == 1 || $failure_verbosity == 2; + my @plans = (); # initial level, no plan yet + my $output_buffer = ""; + + # We rely heavily on perl closures to make failure verbosity work + # We need to do so, because there's no way to safely pass extra + # objects down all the way to the TAP::Parser::Result object + my @failure_output = (); + my %callbacks = (); + if ($failure_verbosity > 0 || defined $openssl_args{tap_copy}) { + $callbacks{ALL} = sub { # on each line of test output + my $self = shift; + my $fh = $openssl_args{tap_copy}; + print $fh $self->as_string, "\n" + if defined $fh; + + my $failure_verbosity = $openssl_args{failure_verbosity}; + if ($failure_verbosity == 3) { + push @failure_output, $self->as_string; + } elsif ($failure_verbosity > 0) { + my $is_plan = $self->is_plan; + my $tests_planned = $is_plan && $self->tests_planned; + my $is_test = $self->is_test; + my $is_ok = $is_test && $self->is_ok; + # workaround in case parser not coping with indentation: + if ($self->is_unknown) { + ($is_plan, $tests_planned) = (1, $1) + if ($self->as_string =~ m/^\s+1\.\.(\d+)/); + ($is_test, $is_ok) = (1, !$1) + if ($self->as_string =~ m/^\s+(not )?ok /); + } + if ($is_plan) { + push @plans, $tests_planned; + $output_buffer = ""; # ignore comments etc. until plan + } elsif ($is_test) { # result of a test + pop @plans if @plans && --($plans[-1]) <= 0; + print $output_buffer if !$is_ok; + print $self->as_string."\n" + if !$is_ok || $failure_verbosity == 2; + $output_buffer = ""; + } else { # typically comment or unknown + $output_buffer .= $self->as_string."\n"; + } + } + } + } + + if ($failure_verbosity > 0) { + $callbacks{EOF} = sub { + my $self = shift; + + # We know we are a TAP::Parser::Aggregator object + if (scalar $self->failed > 0 && @failure_output) { + # We add an extra empty line, because in the case of a + # progress counter, we're still at the end of that progress + # line. + print $_, "\n" foreach (("", @failure_output)); + } + # Echo any trailing comments etc. + print "$output_buffer" if $failure_verbosity != 3; + }; + } + + if (keys %callbacks) { + # If %opts already has a callbacks element, the order here + # ensures we do not override it + %opts = ( callbacks => { %callbacks }, %opts ); + } + + return $class->SUPER::new({ %opts }); } - @tests = @t; + + package TAP::Harness::OpenSSL; + use parent 'TAP::Harness'; + + package main; + + $tapargs{parser_class} = "TAP::Parser::OpenSSL"; + $package = 'TAP::Harness::OpenSSL'; +}; + +unless (defined $eres) { + $eres = eval { + # Fake TAP::Harness in case it's not loaded + package TAP::Harness::fake; + use parent 'Test::Harness'; + + sub new { + my $class = shift; + my %args = %{ shift() }; + + return bless { %args }, $class; + } + + sub runtests { + my $self = shift; + + # Pre TAP::Harness Test::Harness doesn't support [ filename, name ] + # elements, so convert such elements to just be the filename + my @args = map { ref($_) eq 'ARRAY' ? $_->[0] : $_ } @_; + + my @switches = (); + if ($self->{switches}) { + push @switches, $self->{switches}; + } + if ($self->{lib}) { + foreach (@{$self->{lib}}) { + my $l = $_; + + # It seems that $switches is getting interpreted with 'eval' + # or something like that, and that we need to take care of + # backslashes or they will disappear along the way. + $l =~ s|\\|\\\\|g if $^O eq "MSWin32"; + push @switches, "-I$l"; + } + } + + $Test::Harness::switches = join(' ', @switches); + Test::Harness::runtests(@args); + } + + package main; + $package = 'TAP::Harness::fake'; + }; } -@tests = map { abs2rel($_, rel2abs(curdir())); } @tests; +unless (defined $eres) { + print $@,"\n" if $@; + print $!,"\n" if $!; + exit 127; +} + +my $harness = $package->new(\%tapargs); +my $ret = + $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), $tests{$_} ] } + 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"); -runtests(sort @tests); +# 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.