Peter Eisentraut <pe...@eisentraut.org> writes:
> On 27.08.24 10:12, Peter Eisentraut wrote:
>> Here is a new patch version.
>> I simplified the uses of sed and awk inside the Perl script. I also
>> fixed "make installcheck". I noticed that meson installs sepgsql.sql
>> into the wrong directory, so that's fixed also. (Many of the
>> complications in this patch set are because sepgsql is not an
>> extension but a loose SQL script, of which it is now the only one.
>> Maybe something to address separately.)
>> I did end up deciding to keep the old test_sepgsql script, because it
>> does have the documented purpose of testing existing installations. I
>> did change it so that it calls pg_regress directly, without going via
>> make, so that the dependency on make is removed.
>
> This has been committed. And I understand there is a buildfarm client
> update available for the affected buildfarm members.
This patch passed the TAP command invocation cleanup patch mid-flight,
so didn't get the memo about command usng the fat comma for line option
arguments. Here's a patch for bringing it in line with the new
convention. I don't have any machines with SELinux enabled, so either
someone who has would need to test it, or we can rely on the buildfarm.
- ilmari
>From bc899fbe7a89fcdf198421a9abf608772748c1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilm...@ilmari.org>
Date: Tue, 28 Jan 2025 13:32:35 +0000
Subject: [PATCH] sepgsql: update TAP test to use fat comma style
---
contrib/sepgsql/t/001_sepgsql.pl | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/contrib/sepgsql/t/001_sepgsql.pl b/contrib/sepgsql/t/001_sepgsql.pl
index cba51403518..c5fd7254841 100644
--- a/contrib/sepgsql/t/001_sepgsql.pl
+++ b/contrib/sepgsql/t/001_sepgsql.pl
@@ -211,10 +211,10 @@
my $result = run_log(
[
- 'postgres', '--single',
- '-F', '-c',
- 'exit_on_error=true', '-D',
- $node->data_dir, 'template0'
+ 'postgres', '--single', '-F',
+ '-c' => 'exit_on_error=true',
+ '-D' => $node->data_dir,
+ 'template0'
],
'<',
$ENV{share_contrib_dir} . '/sepgsql.sql');
@@ -238,8 +238,11 @@
$node->command_ok(
[
- $ENV{PG_REGRESS}, '--bindir=', '--inputdir=.', '--launcher',
- './launcher', @tests
+ $ENV{PG_REGRESS},
+ '--bindir' => '',
+ '--inputdir' => '.',
+ '--launcher' => './launcher',
+ @tests
],
'sepgsql tests');
--
2.48.1
