[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  be6bdab6f8a3c71a1bc54fd1c9b278398328ab99 (commit)
      from  191c0e2e87c24a59b1007a23b3f04e6e8e4769a7 (commit)


- Log -----------------------------------------------------------------
commit be6bdab6f8a3c71a1bc54fd1c9b278398328ab99
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun May 8 13:09:56 2016 +0100

    Recognise VERBOSE and V as well as HARNESS_VERBOSE
    
    PR#4462
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 INSTALL           | 9 ++++-----
 test/run_tests.pl | 5 +++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 7d8de32..6010df3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -493,13 +493,12 @@
      malfunction with Perl).  You may want increased verbosity, that
      can be accomplished like this:
 
-       $ HARNESS_VERBOSE=yes make test                  # Unix
+       $ make VERBOSE=1 test                            # Unix
 
-       $ DEFINE HARNESS_VERBOSE YES
+       $ DEFINE VERBOSE 1
        $ mms test                                       ! OpenVMS
 
-       $ set HARNESS_VERBOSE=yes
-       $ nmake test                                     # Windows
+       $ nmake VERBOSE=1 test                           # Windows
 
      If you want to run just one or a few specific tests, you can use
      the make variable TESTS to specify them, like this:
@@ -510,7 +509,7 @@
 
      And of course, you can combine (Unix example shown):
        
-       $ HARNESS_VERBOSE=yes make TESTS='test_rsa test_dsa' test
+       $ make VERBOSE=1 TESTS='test_rsa test_dsa' test
 
      You can find the list of available tests like this:
 
diff --git a/test/run_tests.pl b/test/run_tests.pl
index b8fef7c..b8281ac 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -9,6 +9,11 @@
 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 Test::Harness qw/runtests $switches/;