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

To create a temporary installation, the regression test driver should use

Browse Source 
the make program that was used to build itself.  This seems more correct
than guessing around for some gmake.
This commit is contained in:
Peter Eisentraut
2000-10-07 20:23:03 +00:00
parent 969e28d878
commit 9d2f3000f2
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/regress/GNUmakefile
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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,@datadir@,$(datadir),g' \
-e 's/@VERSION@/$(VERSION)/g' \ -e 's/@VERSION@/$(VERSION)/g' \
-e 's/@host_tuple@/$(host_tuple)/g' \ -e 's/@host_tuple@/$(host_tuple)/g' \
-e 's,@GMAKE@,$(MAKE),g' \
$< >$@ $< >$@
chmod a+x $@ chmod a+x $@

17
src/test/regress/pg_regress.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /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` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
@ -87,6 +87,8 @@ export PGPORT
dbname=regression dbname=regression
hostname=`hostname` || hostname=localhost hostname=`hostname` || hostname=localhost
: ${GMAKE='@GMAKE@'}
# ---------- # ----------
# Parse command line options # Parse command line options
@ -169,17 +171,6 @@ case $host_platform in
DIFFFLAGS=-w;; DIFFFLAGS=-w;;
esac esac
# ----------
# Set up the GMAKE variable correctly.
# ----------
case $host_platform in
*beos*)
GMAKE=make;;
*)
GMAKE=gmake;;
esac
# ---------- # ----------
# Set backend timezone and datestyle explicitly # Set backend timezone and datestyle explicitly
@ -297,7 +288,7 @@ then
message "creating temporary installation" message "creating temporary installation"
mkdir -p "$LOGDIR" || { (exit 2); exit; } 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 ] if [ $? -ne 0 ]
then then