From: Richard Levitte <levitte@openssl.org>
Date: Sun, 8 May 2016 14:57:55 +0000 (+0200)
Subject: VMS: support VERBOSE and V in descrip.mms
X-Git-Tag: OpenSSL_1_1_0-pre6~894
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e8173157021518d3595fe8df62ea602940e6c8f4;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index df2c9e160f..83ee61482e 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 6010df32d3..4283e9d199 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