Deleted Added
full compact
run_tests.pl (1.1.1.2) run_tests.pl (1.1.1.1)
1#! /usr/bin/env perl
2# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
3#
4# Licensed under the OpenSSL license (the "License"). You may not use
5# this file except in compliance with the License. You can obtain a copy
6# in the file LICENSE in the source distribution or at
7# https://www.openssl.org/source/license.html
8
9use strict;
10use warnings;
11
12# Recognise VERBOSE and V which is common on other projects.
13BEGIN {
14 $ENV{HARNESS_VERBOSE} = "yes" if $ENV{VERBOSE} || $ENV{V};
15}
16
17use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
18use File::Basename;
1#! /usr/bin/env perl
2# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
3#
4# Licensed under the OpenSSL license (the "License"). You may not use
5# this file except in compliance with the License. You can obtain a copy
6# in the file LICENSE in the source distribution or at
7# https://www.openssl.org/source/license.html
8
9use strict;
10use warnings;
11
12# Recognise VERBOSE and V which is common on other projects.
13BEGIN {
14 $ENV{HARNESS_VERBOSE} = "yes" if $ENV{VERBOSE} || $ENV{V};
15}
16
17use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
18use File::Basename;
19use FindBin;
20use lib "$FindBin::Bin/../util/perl";
21use OpenSSL::Glob;
19use if $^O ne "VMS", 'File::Glob' => qw/glob/;
22use Module::Load::Conditional qw(can_load);
23
24my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef })
25 ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
26
27my $srctop = $ENV{SRCTOP} || $ENV{TOP};
28my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
29my $recipesdir = catdir($srctop, "test", "recipes");
20use Module::Load::Conditional qw(can_load);
21
22my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef })
23 ? 'TAP::Harness' : 'OpenSSL::TAP::Harness';
24
25my $srctop = $ENV{SRCTOP} || $ENV{TOP};
26my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
27my $recipesdir = catdir($srctop, "test", "recipes");
30my $libdir = rel2abs(catdir($srctop, "util", "perl"));
28my $testlib = catdir($srctop, "test", "testlib");
29my $utillib = catdir($srctop, "util");
31
32my %tapargs =
33 ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0,
30
31my %tapargs =
32 ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0,
34 lib => [ $libdir ],
33 lib => [ $testlib, $utillib ],
35 switches => '-w',
36 merge => 1
37 );
38
39my @tests = ( "alltests" );
40if (@ARGV) {
41 @tests = @ARGV;
42}

--- 71 unchanged lines hidden ---
34 switches => '-w',
35 merge => 1
36 );
37
38my @tests = ( "alltests" );
39if (@ARGV) {
40 @tests = @ARGV;
41}

--- 71 unchanged lines hidden ---