From 8ed428dc977f6d3e454892ddca089f17e150384f Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 12 Dec 2019 13:45:15 -0300 Subject: [PATCH] (Blindly) tweak new test regex gcc-based Windows buildfarm animals are not happy about a multiline regular expression I added recently. Try to accomodate; existing pg_basebackup tests suggest that \n should work instead of a bare newline, but throw in \r also. This being perl, TIMTOWTDI. Also remove the pointless $ at the end of the pattern, for extra luck. (If this doesn't work, I'll probably just split the regex in two.) Per buildfarm members jacana and fairywren. Discussion: https://postgr.es/m/3562.1576161217@sss.pgh.pa.us --- src/bin/pgbench/t/001_pgbench_with_server.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl index b91f491b40..25ea17f7d1 100644 --- a/src/bin/pgbench/t/001_pgbench_with_server.pl +++ b/src/bin/pgbench/t/001_pgbench_with_server.pl @@ -296,8 +296,7 @@ pgbench( [], [ qr{ERROR: invalid input syntax for type json}, - qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\. -extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que ...'$]m + qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.[\r\n]+extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que \.\.\.']m ], 'server parameter logging', {