diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-08-17 08:35:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-27 11:53:33 +0200 |
| commit | 8b138d3fe4d9dbbc632511d4ac8b7099b793630b (patch) | |
| tree | 52f30241fb93a5261b785c71391abf2e41ce0d5f /Configurations | |
| parent | Fix SCA vulnerability when using PVK and MSBLOB key formats (diff) | |
| download | openssl-8b138d3fe4d9dbbc632511d4ac8b7099b793630b.tar.xz openssl-8b138d3fe4d9dbbc632511d4ac8b7099b793630b.zip | |
testing: set OPENSSL_MODULES to the providers directory by default
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9618)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 1 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 46f2302f83..0bc1492eea 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -435,10 +435,12 @@ test : tests DEFINE BLDTOP {- builddir() -} DEFINE RESULT_D {- builddir(qw(test test-runs)) -} DEFINE OPENSSL_ENGINES {- builddir("engines") -} + DEFINE OPENSSL_MODULES {- builddir("providers") -} 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_MODULES DEASSIGN OPENSSL_ENGINES DEASSIGN BLDTOP DEASSIGN SRCTOP diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 45f53cc546..1e8a84f946 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -352,6 +352,7 @@ test: tests PERL="$(PERL)" \ EXE_EXT={- platform->binext() -} \ OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines 2>/dev/null && pwd` \ + OPENSSL_MODULES=`cd ../$(BLDDIR)/providers 2>/dev/null && pwd` \ OPENSSL_DEBUG_MEMORY=on \ $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) ) @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 3c8d51b611..a211c2277d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -369,6 +369,7 @@ test: tests set RESULT_D=$(BLDDIR)\test\test-runs set PERL=$(PERL) set OPENSSL_ENGINES=$(MAKEDIR)\engines + set OPENSSL_MODULES=$(MAKEDIR)\providers set OPENSSL_DEBUG_MEMORY=on "$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS) @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} |