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 /Configurations | |
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 'Configurations')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 294c422f9f..512b8e5a08 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 d781e537dc..3a1ade72b7 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: |