diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-05 13:11:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-17 10:10:59 +0100 |
| commit | a717738b45fa7ae90cf3dac0870b8d1ea2a8e173 (patch) | |
| tree | 930272dba40ea23bd8bbfaa612e693b674a291ca /util | |
| parent | 909289dfc31ca7b02652e3e9ed4e2df754fd258f (diff) | |
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 <viktor@openssl.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/pl/BC-32.pl | 1 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 1 | ||||
| -rw-r--r-- | util/pl/unix.pl | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index ef21b58585..6d061d3b68 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 8ed650857e..9c9bee5ce9 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 6add39a565..8d9f25a484 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: |