[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8b138d3fe4d9dbbc632511d4ac8b7099b793630b (commit)
      from  724339ff44235149c4e8ddae614e1dda6863e23e (commit)


- Log -----------------------------------------------------------------
commit 8b138d3fe4d9dbbc632511d4ac8b7099b793630b
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Aug 17 08:35:32 2019 +0200

    testing: set OPENSSL_MODULES to the providers directory by default
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9618)

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

Summary of changes:
 Configurations/descrip.mms.tmpl      | 2 ++
 Configurations/unix-Makefile.tmpl    | 1 +
 Configurations/windows-makefile.tmpl | 1 +
 test/recipes/05-test_md2.t           | 2 --
 test/recipes/05-test_mdc2.t          | 2 --
 test/recipes/30-test_evp.t           | 2 --
 test/recipes/30-test_evp_extra.t     | 2 --
 test/recipes/95-test_external_krb5.t | 1 -
 8 files changed, 4 insertions(+), 9 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(); } "" -}
diff --git a/test/recipes/05-test_md2.t b/test/recipes/05-test_md2.t
index e60e7912f3..00caba54dd 100644
--- a/test/recipes/05-test_md2.t
+++ b/test/recipes/05-test_md2.t
@@ -12,6 +12,4 @@ use OpenSSL::Test qw/:DEFAULT bldtop_dir/;
 
 setup("test_md2");
 
-$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
-
 simple_test("test_md2", "md2test", "md2");
diff --git a/test/recipes/05-test_mdc2.t b/test/recipes/05-test_mdc2.t
index 495a146e35..18d9539ddb 100644
--- a/test/recipes/05-test_mdc2.t
+++ b/test/recipes/05-test_mdc2.t
@@ -21,6 +21,4 @@ if (disabled("mdc2") || disabled("legacy")) {
 
 plan tests => 1;
 
-$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
-
 ok(run(test(["mdc2test"])), "running mdc2test");
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 580ea0320d..7e0be81b1e 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -29,8 +29,6 @@ my @defltfiles = qw( evpencod.txt evpkdf.txt evppkey_kdf.txt evpmac.txt
 
 plan tests => (scalar(@configs) * scalar(@files)) + scalar(@defltfiles);
 
-$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
-
 foreach (@configs) {
     $ENV{OPENSSL_CONF} = srctop_file("test", $_);
 
diff --git a/test/recipes/30-test_evp_extra.t b/test/recipes/30-test_evp_extra.t
index b6fd97afd8..3f4b963fdb 100644
--- a/test/recipes/30-test_evp_extra.t
+++ b/test/recipes/30-test_evp_extra.t
@@ -16,6 +16,4 @@ setup("test_evp_extra");
 
 plan tests => 1;
 
-$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
-
 ok(run(test(["evp_extra_test"])), "running evp_extra_test");
diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t
index abbd8c46b5..0f2be87902 100644
--- a/test/recipes/95-test_external_krb5.t
+++ b/test/recipes/95-test_external_krb5.t
@@ -20,7 +20,6 @@ plan skip_all => "krb5 not available"
 
 plan tests => 1;
 
-$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
 $ENV{OPENSSL_CONF} = srctop_file("test", "default-and-legacy.cnf");
 
 ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");