AArch64 assembly pack: authenticate return addresses.

[openssl.git] / test / run_tests.pl

diff --git a/test/run_tests.pl b/test/run_tests.pl
index 9c5ade10fce6c560a73af3f26fa09aa35a312349..881feaec712d1d37358d2946ff09e10e79e14b38 100644 (file)
--- a/test/run_tests.pl
+++ b/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
@@ -16,24 +16,26 @@ 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 FindBin;
+use lib "$FindBin::Bin/../util/perl";
+use OpenSSL::Glob;
+
+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 $testlib = catdir($srctop, "test", "testlib");
-my $utillib = catdir($srctop, "util");
+my $libdir = rel2abs(catdir($srctop, "util", "perl"));
 
-# 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";
+$ENV{OPENSSL_CONF} = catdir($srctop, "apps", "openssl.cnf");
 
-# 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       => [ $libdir ],
+      switches  => '-w',
+      merge     => 1
+    );
 
 my @alltests = find_matching_tests("*");
 my %tests = ();
@@ -81,7 +83,20 @@ foreach my $arg (@ARGV ? @ARGV : ('alltests')) {
     $initial_arg = 0;
 }
 
-runtests(map { abs2rel($_, rel2abs(curdir())); } sort keys %tests);
+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) = @_;
@@ -91,3 +106,38 @@ sub find_matching_tests {
     }
     return glob(catfile($recipesdir,"*-$glob.t"));
 }
+
+
+# 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(@_);
+}