summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2011-12-30 21:29:25 +0000
committerBruce Momjian2011-12-30 21:29:25 +0000
commitdca0a54717a8372cc88b0c187965a1add19ec7e3 (patch)
tree2968b6196089e7c2253584f84eb6514b4586ec02
parent15ba590792045a6bbde538c407a34d83f46b496f (diff)
Modify tools/pgtest to run the 'make' command from a variable, and default
to 'make' rather than 'gmake' for the binary name.
-rwxr-xr-xsrc/tools/pgtest6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/pgtest b/src/tools/pgtest
index c5356fced8..ffb528302d 100755
--- a/src/tools/pgtest
+++ b/src/tools/pgtest
@@ -8,7 +8,9 @@
# have enough kernel resources to run two postmasters or
# stop your main postmaster before running this script.
#
-# Use -n to prevent 'gmake clean'
+# Use -n to prevent 'make clean'
+
+MAKE="make"
[ ! -d src ] && echo "This must be run from the top of the PostgreSQL source tree" 1>&2 && exit 1
@@ -18,7 +20,7 @@ TMP="/tmp/$$"
[ "X$1" != "X-n" ] && PGCLEAN=clean
-(gmake $PGCLEAN check 2>&1; echo "$?" > $TMP/ret) |
+($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