diff options
| author | Michael Paquier | 2023-11-08 08:29:02 +0000 |
|---|---|---|
| committer | Michael Paquier | 2023-11-08 08:29:02 +0000 |
| commit | b64c8b01c275f802372b6860793737219fe2fd62 (patch) | |
| tree | 9e46f0ad7ad6d580049967a7c347b7173cdb589b | |
| parent | 1b2c6b756eaae5203af887973b306882fb477836 (diff) | |
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/[email protected]
Backpatch-through: 16
| -rw-r--r-- | src/test/ssl/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ssl/meson.build b/src/test/ssl/meson.build index 4cda81f3bc2..abb30ab214f 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', |