summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Configurations/descrip.mms.tmpl2
-rw-r--r--Configurations/unix-Makefile.tmpl1
-rw-r--r--test/Makefile.in3
-rwxr-xr-xtest/recipes/70-test_sslcertstatus.t1
-rwxr-xr-xtest/recipes/70-test_sslextension.t1
-rwxr-xr-xtest/recipes/70-test_sslsessiontick.t1
-rwxr-xr-xtest/recipes/70-test_sslskewith0p.t1
-rwxr-xr-xtest/recipes/70-test_sslvertol.t1
-rw-r--r--test/recipes/70-test_tlsextms.t1
-rw-r--r--test/recipes/90-test_networking.t1
-rw-r--r--util/pl/BC-32.pl1
-rw-r--r--util/pl/VC-32.pl1
-rw-r--r--util/pl/unix.pl2
13 files changed, 8 insertions, 9 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:
diff --git a/test/Makefile.in b/test/Makefile.in
index 313ff6fec2..be4f0623f5 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 216804ce2b..37265ed07a 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 f9a6573cc8..1641daa344 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 56ae4c0cba..caab77745e 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 90fcf30711..b0cc9ffb59 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 d436b5aba7..0795733fb9 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 47a03213c8..bc3b787800 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 16ece75be0..5d876ca51c 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 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:
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 07:49:40 +0000