X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Frun_tests.pl;h=6550e0b27230c80fc26a174735d7632bff89762b;hb=6ae6ff57f2667614c0bd6310f9a2856b3f5defd2;hp=cacbc02b116bd1ac697343a5a0ae5cde06ca2d60;hpb=1780e6d916d83f812ffceec56ac3d8fa97b83248;p=oweals%2Fopenssl.git

diff --git a/test/run_tests.pl b/test/run_tests.pl
index cacbc02b11..6550e0b272 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -1,18 +1,31 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2016 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
+# 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.
+BEGIN {
+    $ENV{HARNESS_VERBOSE} = "yes" if $ENV{VERBOSE} || $ENV{V};
+}
+
 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/;
 
-my $top = $ENV{TOP};
-my $recipesdir = catdir($top, "test", "recipes");
-my $testlib = catdir($top, "test", "testlib");
-my $utillib = catdir($top, "util");
+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");
 
-# It seems that $switches is getting interpretted with 'eval' or something
+# 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";
@@ -27,7 +40,7 @@ if (@ARGV) {
     @tests = @ARGV;
 }
 my $list_mode = scalar(grep /^list$/, @tests) != 0;
-if (grep /^alltests|list$/, @tests) {
+if (grep /^(alltests|list)$/, @tests) {
     @tests = grep {
 	basename($_) =~ /^[0-9][0-9]-[^\.]*\.t$/
     } glob(catfile($recipesdir,"*.t"));