summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-05-08 16:57:55 +0200
committerRichard Levitte <levitte@openssl.org>2016-05-09 16:11:36 +0200
commite8173157021518d3595fe8df62ea602940e6c8f4 (patch)
treefe8c254c4c2fb9ee7a256f0a22e1925568173b89
parentbe6bdab6f8a3c71a1bc54fd1c9b278398328ab99 (diff)
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>
-rw-r--r--Configurations/descrip.mms.tmpl5
-rw-r--r--INSTALL3
2 files changed, 6 insertions, 2 deletions
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