Commit03131ab

committed

pgtest: run clean, build, and check stages separately

This allows for cleaner error reporting.Backpatch-through: 9.5

1 parenta326ca7 commit03131abCopy full SHA for 03131ab

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,25 @@ mkdir /tmp/$$`
`19`	`19`	`TMP="/tmp/$$"`
`20`	`20`
`21`	`21`	`if ["X$1"!="X-n" ]`
`22`		`-thenPGCLEAN=clean`
`23`		`-elseshift`
	`22`	`+thenCLEAN="Y"`
	`23`	`+elseCLEAN=""`
	`24`	`+shift`
`24`	`25`	`fi`
`25`	`26`
`26`	`27`	`rm -f tmp_install/log/install.log`
`27`	`28`
`28`	`29`	`# Run "make check" and store return code in $TMP/ret.`
`29`	`30`	`# Display output but also capture it in $TMP/0.`
`30`		`-($MAKE"$@"$PGCLEAN check2>&1;echo"$?">$TMP/ret)\| tee$TMP/0`
	`31`	`+(`
	`32`	`+if ["$CLEAN" ]`
	`33`	`+then$MAKE"$@" clean2>&1`
	`34`	`+echo"$?">$TMP/ret`
	`35`	`+fi`
	`36`	`+if [$(cat$TMP/ret)-eq 0 ]`
	`37`	`+then$MAKE"$@"2>&1&&$MAKE"$@" check2>&1`
	`38`	`+echo"$?">$TMP/ret`
	`39`	`+fi`
	`40`	`+)\| tee$TMP/0`
`31`	`41`
`32`	`42`	`# Grab possible warnings from install.log`
`33`	`43`	`[-e tmp_install/log/install.log ]&& cat tmp_install/log/install.log>>$TMP/0`

Comments

(0)