The branch master has been updated via a717738b45fa7ae90cf3dac0870b8d1ea2a8e173 (commit) from 909289dfc31ca7b02652e3e9ed4e2df754fd258f (commit)
- Log ----------------------------------------------------------------- commit a717738b45fa7ae90cf3dac0870b8d1ea2a8e173 Author: Richard Levitte <levi...@openssl.org> Date: Sat Mar 5 13:11:37 2016 +0100 Don't define OPENSSL_ENGINES in test recipes, do it in Makefiles instead 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 <vik...@openssl.org> ----------------------------------------------------------------------- Summary of changes: Configurations/descrip.mms.tmpl | 2 ++ Configurations/unix-Makefile.tmpl | 1 + test/Makefile.in | 3 ++- test/recipes/70-test_sslcertstatus.t | 1 - test/recipes/70-test_sslextension.t | 1 - test/recipes/70-test_sslsessiontick.t | 1 - test/recipes/70-test_sslskewith0p.t | 1 - test/recipes/70-test_sslvertol.t | 1 - test/recipes/70-test_tlsextms.t | 1 - test/recipes/90-test_networking.t | 1 - util/pl/BC-32.pl | 1 + util/pl/VC-32.pl | 1 + util/pl/unix.pl | 2 +- 13 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 294c422..512b8e5 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -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("..") -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index d781e53..3a1ade7 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -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: diff --git a/test/Makefile.in b/test/Makefile.in index 313ff6f..be4f062 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -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: diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 216804c..37265ed 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -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, diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index f9a6573..1641daa 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -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, diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 56ae4c0..caab777 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -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($$$$$$); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 90fcf30..b0cc9ff 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -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, diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index d436b5a..0795733 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -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, diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 47a0321..bc3b787 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -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($$$$$); diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index 16ece75..5d876ca 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -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( diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index ef21b58..6d061d3 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -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: diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 8ed6508..9c9bee5 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -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: diff --git a/util/pl/unix.pl b/util/pl/unix.pl index 6add39a..8d9f25a 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -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: _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits