mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't define OPENSSL_ENGINES in test recipes, do it in Makefiles instead

Browse Source 
In most builds, we can assume that engines live in the build tree
subdirectory "engines".  This was hard coded into the tests that use
the engine ossltest.

However, that hard coding is tedious, it would need to be done in
every test recipe, and it's an incorrect assumption in some cases.

This change has us play it safe and let the build files tell the
testing framework where the engines are.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-05 13:11:37 +01:00
parent 909289dfc3
commit a717738b45
13 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/descrip.mms.tmpl
View File

@ -224,7 +224,9 @@ test tests : configdata.pm, -
SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
DEFINE OPENSSL_ENGINES {- builddir("engines") -}
$(PERL) {- sourcefile("test", "run_tests.pl") -} $(TESTS)
DEASSIGN OPENSSL_ENGINES
DEASSIGN BLDTOP
DEASSIGN SRCTOP
SET DEFAULT [-]{- move("..") -}

1
Configurations/unix-Makefile.tmpl
View File

@ -220,6 +220,7 @@ test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \
EXE_EXT={- $exeext -} \
OPENSSL_ENGINES=../$(BLDDIR)/engines \
$(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
list-tests:

3
test/Makefile.in
View File

@ -160,7 +160,8 @@ $(SRC):
@sh $(TOP)/util/point.sh dummytest.c $@
tests: exe apps
TOP=$(TOP) PERL=$(PERL) $(PERL) run_tests.pl $(TESTS)
OPENSSL_ENGINES=../engines TOP=$(TOP) PERL=$(PERL) \
$(PERL) run_tests.pl $(TESTS)
errors:

1
test/recipes/70-test_sslcertstatus.t
View File

@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(
\&certstatus_filter,

1
test/recipes/70-test_sslextension.t
View File

@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(
\&extension_filter,

1
test/recipes/70-test_sslsessiontick.t
View File

@ -67,7 +67,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$$);

1
test/recipes/70-test_sslskewith0p.t
View File

@ -69,7 +69,6 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled"
plan skip_all => "dh is not supported by this OpenSSL build"
if disabled("dh");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(
\&ske_0_p_filter,

1
test/recipes/70-test_sslvertol.t
View File

@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(
\&vers_tolerance_filter,

1
test/recipes/70-test_tlsextms.t
View File

@ -67,7 +67,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$);

1
test/recipes/90-test_networking.t
View File

@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O"
plan skip_all => "$test_name needs the dynamic engine feature enabled"
if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new(

1
util/pl/BC-32.pl
View File

@ -110,6 +110,7 @@ $target: $deps force.$target
set TOP=.
set BIN_D=\$(BIN_D)
set TEST_D=\$(TEST_D)
set OPENSSL_ENGINES=\$(ENG_D)
set PERL=\$(PERL)
\$(PERL) test\\$test_cmd \$(TESTS)
force.$target:

1
util/pl/VC-32.pl
View File

@ -316,6 +316,7 @@ $target: $deps force.$target
set TOP=.
set BIN_D=\$(BIN_D)
set TEST_D=\$(TEST_D)
set OPENSSL_ENGINES=\$(ENG_D)
set PERL=\$(PERL)
\$(PERL) test\\$test_cmd \$(TESTS)
force.$target:

2
util/pl/unix.pl
View File

@ -198,7 +198,7 @@ sub do_test_rule {
my ($target, $deps, $test_cmd) = @_;
my $ret = <<"EOF";
$target: $deps force.$target
TOP=. BIN_D=\$(BIN_D) TEST_D=\$(TEST_D) \\
TOP=. BIN_D=\$(BIN_D) TEST_D=\$(TEST_D) OPENSSL_ENGINES=$(ENG_D) \\
PERL=\$(PERL) \$(PERL) test/$test_cmd \$(TESTS)
force.$target: