Commit a717738b authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarViktor Dukhovni <viktor@openssl.org>
parent 909289df

Configurations/descrip.mms.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -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("..") -}

Configurations/unix-Makefile.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -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:

test/Makefile.in

+2 −1
Original line number Diff line number Diff line
@@ -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:

test/recipes/70-test_sslcertstatus.t

+0 −1
Original line number Diff line number Diff line
@@ -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,

test/recipes/70-test_sslextension.t

+0 −1
Original line number Diff line number Diff line
@@ -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,