The branch master has been updated
via 6d4bc8a3d2c2f7701588bbfdea80a1f7a3973f26 (commit)
from 3b0478fe03191bedef44644996a5a6da51f77eaf (commit)
- Log -----------------------------------------------------------------
commit 6d4bc8a3d2c2f7701588bbfdea80a1f7a3973f26
Author: Richard Levitte <levi...@openssl.org>
Date: Thu Nov 3 17:08:10 2016 +0100
Enable memory debugging while testing
Pre 1.1.0, 'make test' would set the environment variable
OPENSSL_DEBUG_MEMORY to "on". This got lost when translating the old
build files to the new templates. This changes reintroduces that
variable.
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1840)
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 2 ++
Configurations/unix-Makefile.tmpl | 1 +
Configurations/windows-makefile.tmpl | 1 +
3 files changed, 4 insertions(+)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 3d221f5..15e0678 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -267,8 +267,10 @@ test tests : build_generated, build_programs_nodep,
build_engines_nodep, -
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
DEFINE OPENSSL_ENGINES {- builddir("engines") -}
+ DEFINE OPENSSL_DEBUG_MEMORY "on"
IF "$(VERBOSE)" .NES. "" THEN DEFINE VERBOSE "$(VERBOSE)"
$(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS)
+ DEASSIGN OPENSSL_DEBUG_MEMORY
DEASSIGN OPENSSL_ENGINES
DEASSIGN BLDTOP
DEASSIGN SRCTOP
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index b263832..eb47630 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -251,6 +251,7 @@ test: tests
PERL="$(PERL)" \
EXE_EXT={- $exeext -} \
OPENSSL_ENGINES=../$(BLDDIR)/engines \
+ OPENSSL_DEBUG_MEMORY=on \
$(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } ""
-}
@echo "Tests are not supported with your chosen Configure options"
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index 4c8e89f..a0ee953 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -198,6 +198,7 @@ tests: build_generated build_programs_nodep
build_engines_nodep depend
set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR)
set PERL=$(PERL)
+ set OPENSSL_DEBUG_MEMORY=on
"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
@rem {- if ($disabled{tests}) { output_on(); } else { output_off(); }
"" -}
@echo "Tests are not supported with your chosen Configure options"
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
