Commite94f2bc

committed

Fix pgbench TAP test to work in VPATH builds.

Previously, it'd try to create log files under the source directorynot the build directory. This fell over if the source isn't writableby the building user.Fabien CoelhoDiscussion:https://postgr.es/m/alpine.DEB.2.20.1801101038340.2283@lancre

1 parentfd1a421 commite94f2bcCopy full SHA for e94f2bc

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -605,24 +605,26 @@ sub check_pgbench_logs`
`605`	`605`	`ok(unlink(@logs),"remove log files");`
`606`	`606`	`}`
`607`	`607`
	`608`	`+my$bdir =$node->basedir;`
	`609`	`+`
`608`	`610`	`# with sampling rate`
`609`	`611`	`pgbench(`
`610`		`-'-n -S -t 50 -c 2 --log --log-prefix=001_pgbench_log_2 --sampling-rate=0.5',`
	`612`	`+"-n -S -t 50 -c 2 --log --log-prefix=$bdir/001_pgbench_log_2 --sampling-rate=0.5",`
`611`	`613`	`0,`
`612`	`614`	`[qr{select only},qr{processed: 100/100} ],`
`613`	`615`	`[qr{^$}],`
`614`	`616`	`'pgbench logs');`
`615`	`617`
`616`		`-check_pgbench_logs('001_pgbench_log_2', 1, 8, 92,`
	`618`	`+check_pgbench_logs("$bdir/001_pgbench_log_2", 1, 8, 92,`
`617`	`619`	`qr{^0\d{1,2}\d+\d\d+\d+$});`
`618`	`620`
`619`	`621`	`# check log file in some detail`
`620`	`622`	`pgbench(`
`621`		`-'-n -b se -t 10 -l --log-prefix=001_pgbench_log_3',`
	`623`	`+"-n -b se -t 10 -l --log-prefix=$bdir/001_pgbench_log_3",`
`622`	`624`	`0, [qr{select only},qr{processed: 10/10} ],`
`623`	`625`	`[qr{^$}],'pgbench logs contents');`
`624`	`626`
`625`		`-check_pgbench_logs('001_pgbench_log_3', 1, 10, 10,`
	`627`	`+check_pgbench_logs("$bdir/001_pgbench_log_3", 1, 10, 10,`
`626`	`628`	`qr{^\d\d{1,2}\d+\d\d+\d+$});`
`627`	`629`
`628`	`630`	`# done`

Comments

(0)