diff options
| author | Peter Eisentraut | 2000-10-07 20:23:03 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2000-10-07 20:23:03 +0000 |
| commit | 9d2f3000f2004e0e7624277edc1769bd7ffc1ed8 (patch) | |
| tree | b58c0f2c041fd3b86f3b4e5365dd07b06b79b301 /src/test | |
| parent | 969e28d87878457fb99b60b292c3f99689a7591c (diff) | |
To create a temporary installation, the regression test driver should use
the make program that was used to build itself. This seems more correct
than guessing around for some gmake.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 17 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 3b7120b11cb..43d29cd8f92 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.25 2000/10/02 06:07:25 tgl Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.26 2000/10/07 20:23:03 petere Exp $ # #------------------------------------------------------------------------- @@ -36,6 +36,7 @@ pg_regress: pg_regress.sh GNUmakefile -e 's,@datadir@,$(datadir),g' \ -e 's/@VERSION@/$(VERSION)/g' \ -e 's/@host_tuple@/$(host_tuple)/g' \ + -e 's,@GMAKE@,$(MAKE),g' \ $< >$@ chmod a+x $@ diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index a78730f7a4a..34584a6e4f0 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.6 2000/10/07 14:55:16 momjian Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.7 2000/10/07 20:23:03 petere Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -87,6 +87,8 @@ export PGPORT dbname=regression hostname=`hostname` || hostname=localhost +: ${GMAKE='@GMAKE@'} + # ---------- # Parse command line options @@ -169,17 +171,6 @@ case $host_platform in DIFFFLAGS=-w;; esac -# ---------- -# Set up the GMAKE variable correctly. -# ---------- - -case $host_platform in - *beos*) - GMAKE=make;; - *) - GMAKE=gmake;; -esac - # ---------- # Set backend timezone and datestyle explicitly @@ -297,7 +288,7 @@ then message "creating temporary installation" mkdir -p "$LOGDIR" || { (exit 2); exit; } - ${MAKE:-$GMAKE} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1 + $GMAKE -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1 if [ $? -ne 0 ] then |