From fa4d3fe46dfb4909c3c18c9d6141bb3b60a09eed Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Wed, 8 Apr 2020 10:05:27 -0700 Subject: [PATCH] Fix krb5 external test Since commit c3845ceba84aab9ddeb43f043549238fd10de63b ("Build file templates: don't set OPENSSL_{ENGINES,MODULES}") the krb5 external test has been failing. This is because it relied on OPENSSL_MODULES already being set -- even though it did assign to OPENSSL_MODULES itself (and thus got skipped by the cleanup pass in that commit), it was doing so only to canonicalize the existing value to an absolute path, not as a de novo assignment. Catch up to the rest of the tree and just set it directly as the "providers" path from the build top (but still canonicalized to an absolute path). [extended tests] Fixes: 11492 Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/11499) --- test/recipes/95-test_external_krb5.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t index 889626a1be..85bca44502 100644 --- a/test/recipes/95-test_external_krb5.t +++ b/test/recipes/95-test_external_krb5.t @@ -21,7 +21,7 @@ plan skip_all => "krb5 not available" plan tests => 1; -$ENV{OPENSSL_MODULES} = abs_path($ENV{OPENSSL_MODULES}); +$ENV{OPENSSL_MODULES} = abs_path(bldtop_dir("providers")); $ENV{OPENSSL_CONF} = abs_path(srctop_file("test", "default-and-legacy.cnf")); ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests"); -- 2.25.1