summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2018-07-28 11:35:52 -0400
committerBruce Momjian <bruce@momjian.us>2018-07-28 11:35:52 -0400
commitfe25526e9d5cd6418313c63e43d6780187a7d1b1 (patch)
treeabc0865771a540621e15be742ec03a15afcbca20
parentff8ce0b79009cb178f2572ce0abc861e4a0a3fe5 (diff)
pgtest: grab possible warnings from install.log
Since PG 9.5, 'make check' records the build output in install.log, so look in there for warnings too. Backpatch-through: 9.5
-rwxr-xr-xsrc/tools/pgtest5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/pgtest b/src/tools/pgtest
index 79954940d22..b16a798470b 100755
--- a/src/tools/pgtest
+++ b/src/tools/pgtest
@@ -23,10 +23,15 @@ then PGCLEAN=clean
else 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
+# Grab possible warnings from install.log
+[ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> $TMP/0
+
# If success, display warnings
if [ $(cat $TMP/ret) -eq 0 ]
then cat $TMP/0 |