]> granicus.if.org Git - postgresql/commitdiff
pgtest: grab possible warnings from install.log
authorBruce Momjian <bruce@momjian.us>
Sat, 28 Jul 2018 15:35:53 +0000 (11:35 -0400)
committerBruce Momjian <bruce@momjian.us>
Sat, 28 Jul 2018 15:35:53 +0000 (11:35 -0400)
Since PG 9.5, 'make check' records the build output in install.log, so
look in there for warnings too.

Backpatch-through: 9.5

src/tools/pgtest

index 79954940d2246efdf9d132eb880105258bf59a76..b16a798470b1b109df6e956b61902dff43e92dcb 100755 (executable)
@@ -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 |