database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-16 17:07:43 +03:00
Code Activity

pgtest: update shell script to use more modern syntax

Browse Source 
script is src/tools/pgtest

Backpatch-through: master
This commit is contained in:
Bruce Momjian
2023-08-14 13:45:29 -04:00
parent af720b4c50
commit 50d1a6444e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tools/pgtest
View File

@@ -18,9 +18,9 @@ trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
mkdir /tmp/$$ mkdir /tmp/$$
TMP="/tmp/$$" TMP="/tmp/$$"
if [ "X$1" != "X-n" ] if [ "$1" != "-n" ]
then CLEAN="Y" then CLEAN="Y"
else CLEAN="" else CLEAN="N"
shift shift
fi fi
@@ -29,22 +29,22 @@ rm -f tmp_install/log/install.log
# Run "make check" and store return code in $TMP/ret. # Run "make check" and store return code in $TMP/ret.
# Display output but also capture it in $TMP/0. # Display output but also capture it in $TMP/0.
( (
if [ "$CLEAN" ] if [ "$CLEAN" = 'Y' ]
then $MAKE "$@" clean 2>&1 then $MAKE "$@" clean 2>&1
echo "$?" > $TMP/ret echo "$?" > "$TMP"/ret
fi fi
if [ $(cat $TMP/ret) -eq 0 ] if [ "$(cat "$TMP"/ret)" -eq 0 ]
then $MAKE "$@" 2>&1 && $MAKE "$@" check 2>&1 then $MAKE "$@" 2>&1 && $MAKE "$@" check 2>&1
echo "$?" > $TMP/ret echo "$?" > "$TMP"/ret
fi fi
) | tee $TMP/0 ) | tee "$TMP"/0
# Grab possible warnings from install.log # Grab possible warnings from install.log
[ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> $TMP/0 [ -e tmp_install/log/install.log ] && cat tmp_install/log/install.log >> "$TMP"/0
# If success, display warnings # If success, display warnings
if [ $(cat $TMP/ret) -eq 0 ] if [ "$(cat "$TMP"/ret)" -eq 0 ]
then cat $TMP/0 | then cat "$TMP"/0 |
# The following grep's have to be adjusted for your setup because # The following grep's have to be adjusted for your setup because
# certain warnings are acceptable. # certain warnings are acceptable.
grep -i warning | grep -i warning |
@@ -54,4 +54,4 @@ then cat $TMP/0 |
fi fi
# return original make error code # return original make error code
exit `cat $TMP/ret` exit "$(cat "$TMP"/ret)"