[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Richard Levitte
levitte at openssl.org
Wed May 10 15:08:27 UTC 2017
The branch OpenSSL_1_1_0-stable has been updated
via fbf09642692d3bf9343301d1e8befd37eef0277c (commit)
from 410ab527b38ea99e1d897cc60c45aad0d9bac913 (commit)
- Log -----------------------------------------------------------------
commit fbf09642692d3bf9343301d1e8befd37eef0277c
Author: Richard Levitte <levitte at openssl.org>
Date: Wed May 10 12:58:36 2017 +0200
Prefer TAP::Harness over Test::Harness
TAP:Harness came along in perl 5.10.1, and since we claim to support
perl 5.10.0 in configuration and testing, we can only load it
conditionally.
The main reason to use TAP::Harness rather than Test::Harness is its
capability to merge stdout and stderr output from the test recipes,
which Test::Harness can't. The merge gives much more comprehensible
output when testing verbosely.
Reviewed-by: Rich Salz <rsalz at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3424)
(cherry picked from commit 76e0d0b21cc4e8a879d54f4d78a392826dadb1d1)
-----------------------------------------------------------------------
Summary of changes:
test/run_tests.pl | 58 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 47 insertions(+), 11 deletions(-)
diff --git a/test/run_tests.pl b/test/run_tests.pl
index 6550e0b..f1fcbfc 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -17,7 +17,10 @@ BEGIN {
use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
-use Test::Harness qw/runtests $switches/;
+use Module::Load::Conditional qw(can_load);
+
+my $TAP_Harness = can_load({modules => [ 'TAP::Harness' ]})
+ ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
my $srctop = $ENV{SRCTOP} || $ENV{TOP};
my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
@@ -25,15 +28,12 @@ my $recipesdir = catdir($srctop, "test", "recipes");
my $testlib = catdir($srctop, "test", "testlib");
my $utillib = catdir($srctop, "util");
-# 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.
-$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 %tapargs =
+ ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0,
+ lib => [ $testlib, $utillib ],
+ switches => '-w',
+ merge => 1
+ );
my @tests = ( "alltests" );
if (@ARGV) {
@@ -61,5 +61,41 @@ if ($list_mode) {
} else {
@tests = map { abs2rel($_, rel2abs(curdir())); } @tests;
- runtests(sort @tests);
+ my $harness = $TAP_Harness->new(\%tapargs);
+ $harness->runtests(sort @tests);
+}
+
+
+# Fake TAP::Harness in case it's not loaded
+use Test::Harness;
+package OpenSSL::TAP::Harness;
+
+sub new {
+ my $class = shift;
+ my %args = %{ shift() };
+
+ return bless { %args }, $class;
+}
+
+sub runtests {
+ my $self = shift;
+
+ 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(@_);
}
More information about the openssl-commits
mailing list