(Blindly) tweak new test regex

alvherre · alvherre · commit 8ed428dc977f · 2019-12-12T13:45:15.000-03:00
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
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -296,8 +296,7 @@ sub 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',
 		{

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,7 @@ sub pgbench`
`296`	`296`	`[],`
`297`	`297`	`[`
`298`	`298`	`qr{ERROR: invalid input syntax for type json},`
`299`		`- qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.`
`300`		`-extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que ...'$]m`
	`299`	`+ 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`
`301`	`300`	`],`
`302`	`301`	`'server parameter logging',`
`303`	`302`	`{`