diff options
author | Bruce Momjian | 2018-07-28 19:34:06 +0000 |
---|---|---|
committer | Bruce Momjian | 2018-07-28 19:34:06 +0000 |
commit | e2c0df7828b9e91963a05f5151a7d6eead014132 (patch) | |
tree | 1200f28b191ae6682c2b807bd0339fc903e30cdb | |
parent | 244142d32afd02e7408a2ef1f249b00393983822 (diff) |
pgtest: run clean, build, and check stages separately
This allows for cleaner error reporting.
Backpatch-through: 9.5
-rwxr-xr-x | src/tools/pgtest | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/tools/pgtest b/src/tools/pgtest index b16a798470..70f6a62ad0 100755 --- a/src/tools/pgtest +++ b/src/tools/pgtest @@ -19,15 +19,25 @@ mkdir /tmp/$$ TMP="/tmp/$$" if [ "X$1" != "X-n" ] -then PGCLEAN=clean -else shift +then CLEAN="Y" +else CLEAN="" + shift fi rm -f tmp_install/log/install.log # Run "make check" and store return code in $TMP/ret. # Display output but also capture it in $TMP/0. -($MAKE "$@" $PGCLEAN check 2>&1; echo "$?" > $TMP/ret) | tee $TMP/0 +( + if [ "$CLEAN" ] + then $MAKE "$@" clean 2>&1 + echo "$?" > $TMP/ret + fi + if [ $(cat $TMP/ret) -eq 0 ] + then $MAKE "$@" 2>&1 && $MAKE "$@" check 2>&1 + echo "$?" > $TMP/ret + fi +) | tee $TMP/0 # Grab possible warnings from install.log [ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> $TMP/0 |