From b64c8b01c275f802372b6860793737219fe2fd62 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 8 Nov 2023 17:29:02 +0900 Subject: [PATCH] Fix use of OPENSSL in SSL tests if command is not found `openssl` is an optional dependency in the meson build as it may not be installed in an environment even if SSL libraries are around. The meson scripts assume that, but the SSL tests thought that it was a hard dependency, causing a meson installation to fail if `openssl` could not be found. Like similar tests that depend on external commands, and to be consistent with ./configure for the SSL tests, this commit makes the command existence optional in the tests. Author: Tristan Partin Discussion: https://postgr.es/m/CWSX6P5OUUM5.N7B74KQ06ZP6@neon.tech Backpatch-through: 16 --- src/test/ssl/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/ssl/meson.build b/src/test/ssl/meson.build index 4cda81f3bc..abb30ab214 100644 --- a/src/test/ssl/meson.build +++ b/src/test/ssl/meson.build @@ -7,7 +7,7 @@ tests += { 'tap': { 'env': { 'with_ssl': ssl_library, - 'OPENSSL': openssl.path(), + 'OPENSSL': openssl.found() ? openssl.path() : '', }, 'tests': [ 't/001_ssltests.pl', -- 2.39.5