From 0cd2682561f37bfe9b316c5806db1d3526aa21c9 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Mon, 13 Jun 2022 18:16:33 -0400 Subject: [PATCH v2 1/2] Make config_data method more flexible. If given a single option, return the value as now. If given multiple options return the list of values. If given no options at all return the output in a single string in scalar context, or a map in array context. --- src/test/perl/PostgreSQL/Test/Cluster.pm | 35 ++++++++++++++++++------ 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index c8c7bc5045..2a142e97f5 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -345,27 +345,46 @@ sub pg_version =pod -=item $node->config_data($option) +=item $node->config_data( option ...) -Return a string holding configuration data from pg_config, with $option -being the option switch used with the pg_config command. +Return configuration data from pg_config, using options (if supplied). +The options will be things like '--sharedir'. + +If no options are supplied, return a string in scalar context or a map in +array context. + +If options are supplied, return the list of values. =cut sub config_data { - my ($self, $option) = @_; + my ($self, @options) = @_; local %ENV = $self->_get_env(); my ($stdout, $stderr); my $result = - IPC::Run::run [ $self->installed_command('pg_config'), $option ], + IPC::Run::run [ $self->installed_command('pg_config'), @options ], '>', \$stdout, '2>', \$stderr or die "could not execute pg_config"; + # standardize line endings + $stdout =~ s/\r(?=\n)//g; + # no options, scalar context: just hand back the output + return $stdout unless (wantarray || @options); chomp($stdout); - $stdout =~ s/\r$//; - - return $stdout; + # exactly one option: hand back the output (minus LF) + return $stdout if (@options == 1); + my @lines = split(/\n/, $stdout); + # more than one option: hand back the list of values; + return @lines if (@options); + # no options, array context: return a map + my @map; + foreach my $line (@lines) + { + my ($k,$v) = split (/ = /,$line,2); + push(@map, $k, $v); + } + return @map; } =pod -- 2.25.1