Browse Source

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)
master
Richard Levitte 3 years ago
parent
commit
8b138d3fe4
8 changed files with 4 additions and 9 deletions
  1. +2
    -0
      Configurations/descrip.mms.tmpl
  2. +1
    -0
      Configurations/unix-Makefile.tmpl
  3. +1
    -0
      Configurations/windows-makefile.tmpl
  4. +0
    -2
      test/recipes/05-test_md2.t
  5. +0
    -2
      test/recipes/05-test_mdc2.t
  6. +0
    -2
      test/recipes/30-test_evp.t
  7. +0
    -2
      test/recipes/30-test_evp_extra.t
  8. +0
    -1
      test/recipes/95-test_external_krb5.t

+ 2
- 0
Configurations/descrip.mms.tmpl View File

@ -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


+ 1
- 0
Configurations/unix-Makefile.tmpl View File

@ -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(); } "" -}


+ 1
- 0
Configurations/windows-makefile.tmpl View File

@ -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(); } "" -}


+ 0
- 2
test/recipes/05-test_md2.t View File

@ -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");

+ 0
- 2
test/recipes/05-test_mdc2.t View File

@ -21,6 +21,4 @@ if (disabled("mdc2") || disabled("legacy")) {
plan tests => 1;
$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
ok(run(test(["mdc2test"])), "running mdc2test");

+ 0
- 2
test/recipes/30-test_evp.t View File

@ -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", $_);


+ 0
- 2
test/recipes/30-test_evp_extra.t View File

@ -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");

+ 0
- 1
test/recipes/95-test_external_krb5.t View File

@ -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");

Loading…
Cancel
Save