Commit93b7d97

committed

Take PROVE_FLAGS from the command line but not the environment

This reverts commit56b6ef8 and insteadmakes vcregress.pl parse out PROVE_FLAGS from a command line argumentwhen doing a TAP test, thus making it consistent with the makefiletreatment.Discussion:https://postgr.es/m/c26a7416-2fb9-34ab-7991-618c922f896e%402ndquadrant.comBackpatch to 9.4 like previous patch.

1 parente20f679 commit93b7d97Copy full SHA for 93b7d97

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ PROVE = @PROVE@`
`340`	`340`	`# extra perl modules in their own directory.`
`341`	`341`	`PG_PROVE_FLAGS = -I$(top_srcdir)/src/test/perl/ -I$(srcdir)`
`342`	`342`	`# User-supplied prove flags such as --verbose can be provided in PROVE_FLAGS.`
`343`		`-`
	`343`	`+PROVE_FLAGS =`
`344`	`344`
`345`	`345`	`# prepend to path if already set, else just set it`
`346`	`346`	`defineadd_to_path`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,12 +178,18 @@ sub tap_check`
`178`	`178`	`die"Tap tests not enabled in configuration"`
`179`	`179`	`unless$config->{tap_tests};`
`180`	`180`
	`181`	`+my@flags;`
	`182`	`+foreachmy$arg (0 ..scalar(@_))`
	`183`	`+{`
	`184`	`+nextunless$_[$arg] =~/^PROVE_FLAGS=(.*)/;`
	`185`	`+@flags =split(/\s+/,$1);`
	`186`	`+splice(@_,$arg,1);`
	`187`	`+last;`
	`188`	`+}`
	`189`	`+`
`181`	`190`	`my$dir =shift;`
`182`	`191`	`chdir$dir;`
`183`	`192`
`184`		`-my@flags;`
`185`		`-@flags =split(/\s+/,$ENV{PROVE_FLAGS})ifexists$ENV{PROVE_FLAGS};`
`186`		`-`
`187`	`193`	`my@args = ("prove",@flags,"t/*.pl");`
`188`	`194`
`189`	`195`	`# adjust the environment for just this test`

Comments

(0)