Re: pgsql: Fix pattern matching logic for logs in TAP tests of pgbench

From: Andrew Dunstan <andrew(at)dunslane(dot)net>
To: Michael Paquier <michael(at)paquier(dot)xyz>
Cc: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: Re: pgsql: Fix pattern matching logic for logs in TAP tests of pgbench
Date: 2021-06-25 10:12:09
Message-ID: 8617bf50-0a00-afdc-0bc8-41ffc7f70f39@dunslane.net
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers pgsql-hackers


On 6/24/21 11:08 PM, Michael Paquier wrote:
> On Thu, Jun 24, 2021 at 10:26:18PM -0400, Andrew Dunstan wrote:
>> Since the file isn't read in using slurp_file, that $ won't match
>> because the lines will end \r\n instead of \n.
> I did not remember this one with Msys, thanks. I am not sure that
> there is any need for an eval block here actually once you remove
> open()? What do you think about something like the attached?

+        # On Msys, filter out any CRLF.
+        $contents_raw =~ s/\r\n/\n/g if $Config{osname} eq 'msys';

This is completely redundant. The whole point is that slurp_file does
exactly this for you.

+        my @contents = split("\n", $contents_raw);

Probably more idiomatic to write split(/\n/,$contents_raw), or
split(/^/, $contents_raw) if you want to keep the line feeds.

cheers

andrew

--
Andrew Dunstan
EDB: https://www.enterprisedb.com

In response to

Responses

Browse pgsql-committers by date

  From Date Subject
Next Message Michael Paquier 2021-06-25 11:16:47 pgsql: Cleanup some code related to pgbench log checks in TAP tests
Previous Message Peter Eisentraut 2021-06-25 09:40:36 pgsql: Put option listing back into alphabetical order

Browse pgsql-hackers by date

  From Date Subject
Next Message Yugo NAGATA 2021-06-25 11:01:13 Re: [HACKERS] WIP aPatch: Pgbench Serialization and deadlock errors
Previous Message Simon Riggs 2021-06-25 09:41:07 Re: Doc chapter for Hash Indexes