Re: Fix use of openssl.path() if openssl isn't found
Tristan Partin <tristan@neon.tech>
From: "Tristan Partin" <tristan@neon.tech>
To: "Michael Paquier" <michael@paquier.xyz>
Cc: "pgsql-hackers" <pgsql-hackers@postgresql.org>
Date: 2023-11-08T06:07:49Z
Lists: pgsql-hackers
Attachments
- v2-0001-Fix-use-of-openssl.path-if-openssl-isn-t-found.patch (text/x-patch) patch v2-0001
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)
Commits
-
Fix use of OPENSSL in SSL tests if command is not found
- 2a08dda29128 16.2 landed
- b64c8b01c275 17.0 landed