[openssl-commits] [openssl] master update

[Richard Levitte]

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


- Log -----------------------------------------------------------------
commit e8173157021518d3595fe8df62ea602940e6c8f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun May 8 16:57:55 2016 +0200

    VMS: support VERBOSE and V in descrip.mms
    
    With Unixly Makefiles as well as with nmake, make variables are
    transferred to the shell running the commands as envinronment
    variables.  This principle doesn't apply with MMS, so we must
    explicitely define VERBOSE as commands when it's needed.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configurations/descrip.mms.tmpl | 5 +++++
 INSTALL                         | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index df2c9e1..83ee614 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -82,6 +82,10 @@ CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -})
 SRCDIR={- $config{sourcedir} -}
 BUILDDIR={- $config{builddir} -}
 
+# Allow both V and VERBOSE to indicate verbosity.  This only applies
+# to testing.
+VERBOSE=$(V)
+
 VERSION={- $config{version} -}
 MAJOR={- $config{major} -}
 MINOR={- $config{minor} -}
@@ -234,6 +238,7 @@ test tests : configdata.pm, -
         DEFINE SRCTOP {- sourcedir() -}
         DEFINE BLDTOP {- builddir() -}
         DEFINE OPENSSL_ENGINES {- builddir("engines") -}
+        IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)"
         $(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS)
         DEASSIGN OPENSSL_ENGINES
         DEASSIGN BLDTOP
diff --git a/INSTALL b/INSTALL
index 6010df3..4283e9d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -495,8 +495,7 @@
 
        $ make VERBOSE=1 test                            # Unix
 
-       $ DEFINE VERBOSE 1
-       $ mms test                                       ! OpenVMS
+       $ mms /macro=(VERBOSE=1) test                    ! OpenVMS
 
        $ nmake VERBOSE=1 test                           # Windows