diff options
author | Bruce Momjian <bruce@momjian.us> | 2012-08-10 16:46:02 -0400 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2012-08-10 16:46:02 -0400 |
commit | 914b1301cc7b4c1ffba9f4c037e6e76f8e787e05 (patch) | |
tree | 6a911ef058415d84da160f0fa557c7702e992540 /src | |
parent | 99ed473acb47cb0cda47032e3d2392beca569d59 (diff) | |
download | postgresql-914b1301cc7b4c1ffba9f4c037e6e76f8e787e05.tar.gz postgresql-914b1301cc7b4c1ffba9f4c037e6e76f8e787e05.zip |
Adjust pgtest coding to be less complex.
Diffstat (limited to 'src')
-rwxr-xr-x | src/tools/pgtest | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/tools/pgtest b/src/tools/pgtest index c160f583209..cca7f03b08f 100755 --- a/src/tools/pgtest +++ b/src/tools/pgtest @@ -20,19 +20,20 @@ TMP="/tmp/$$" [ "X$1" != "X-n" ] && PGCLEAN=clean -# run make check, capture return code in $TMP/ret, then display -# that but capture it in $TMP/0 too, and return original make -# error code. If that succeded, display captured warnings - -($MAKE $PGCLEAN check 2>&1; echo "$?" > $TMP/ret) | - (tee $TMP/0; exit `cat $TMP/ret`) && -cat $TMP/0 | -# The following grep's have to be adjusted for your setup because -# certain warnings are acceptable. -grep -i warning | -grep -v setproctitle | -grep -v find_rule | -grep -v yy_flex_realloc +# 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 success, display warnings +if [ $(cat $TMP/ret) -eq 0 ] +then cat $TMP/0 | + # The following grep's have to be adjusted for your setup because + # certain warnings are acceptable. + grep -i warning | + grep -v setproctitle | + grep -v find_rule | + grep -v yy_flex_realloc +fi # return original make error code exit `cat $TMP/ret` |