Commit3c017a5

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 parentfd84995 commit3c017a5Copy full SHA for 3c017a5

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
`@@ -336,7 +336,7 @@ PROVE = @PROVE@`
`336`	`336`	`# extra perl modules in their own directory.`
`337`	`337`	`PG_PROVE_FLAGS = -I$(top_srcdir)/src/test/perl/ -I$(srcdir)`
`338`	`338`	`# User-supplied prove flags such as --verbose can be provided in PROVE_FLAGS.`
`339`		`-`
	`339`	`+PROVE_FLAGS =`
`340`	`340`
`341`	`341`	`# prepend to path if already set, else just set it`
`342`	`342`	`defineadd_to_path`

Lines changed: 9 additions & 3 deletions

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

Comments

(0)