On Tue Nov 7, 2023 at 11:53 PM CST, Michael Paquier wrote:
On Tue, Nov 07, 2023 at 04:06:56PM -0600, Tristan Partin wrote: > Found this issue during my Fedora 39 upgrade. Tested that uninstalling > openssl still allows the various ssl tests to run and succeed.Good catch. You are right that this is inconsistent with what we expect in the test. > +openssl_path = '' > +if openssl.found() > + openssl_path = openssl.path() > +endif > + > tests += { > 'name': 'ssl', > 'sd': meson.current_source_dir(), > @@ -7,7 +12,7 @@ tests += { > 'tap': { > 'env': { > 'with_ssl': ssl_library, > - 'OPENSSL': openssl.path(), > + 'OPENSSL': openssl_path, > }, > 'tests': [ > 't/001_ssltests.pl', Okay, that's a nit and it leads to the same result, but why not using the same one-liner style like all the other meson.build files that rely on optional commands? See pg_verifybackup, pg_dump, etc. That would be more consistent.
Because I forgot there were ternary statements in Meson :). Thanks for the review. Here is v2.
-- Tristan Partin Neon (https://neon.tech)
From 5fc0460b0b85b8f04976182c0f6ec650c40df833 Mon Sep 17 00:00:00 2001 From: Tristan Partin <[email protected]> Date: Tue, 7 Nov 2023 15:59:04 -0600 Subject: [PATCH v2] Fix use of openssl.path() if openssl isn't found openssl(1) is an optional dependency of the Postgres Meson build, but was inadvertantly required when defining some SSL tests. --- 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..ed83c438ef 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', -- Tristan Partin Neon (https://neon.tech)
