Commit9d2f300

committed

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

the make program that was used to build itself. This seems more correctthan guessing around for some gmake.

1 parent969e28d commit9d2f300Copy full SHA for 9d2f300

File tree

-14

lines changed

-14

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.25 2000/10/02 06:07:25 tgl Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.26 2000/10/07 20:23:03 petere Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -36,6 +36,7 @@ pg_regress: pg_regress.sh GNUmakefile`
`36`	`36`	`-e's,@datadir@,$(datadir),g'\`
`37`	`37`	`-e's/@VERSION@/$(VERSION)/g'\`
`38`	`38`	`-e's/@host_tuple@/$(host_tuple)/g'\`
	`39`	`+ -e's,@GMAKE@,$(MAKE),g'\`
`39`	`40`	`$<>$@`
`40`	`41`	`chmod a+x$@`
`41`	`42`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.6 2000/10/0714:55:16 momjian Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.7 2000/10/0720:23:03 petere Exp $`
`3`	`3`
`4`	`4`	me=`basename$0`
`5`	`5`	`:${TMPDIR=/tmp}`
`@@ -87,6 +87,8 @@ export PGPORT`
`87`	`87`	`dbname=regression`
`88`	`88`	hostname=`hostname`\|\| hostname=localhost
`89`	`89`
	`90`	`+:${GMAKE='@GMAKE@'}`
	`91`	`+`
`90`	`92`
`91`	`93`	`# ----------`
`92`	`94`	`# Parse command line options`
`@@ -169,17 +171,6 @@ case $host_platform in`
`169`	`171`	`DIFFFLAGS=-w;;`
`170`	`172`	`esac`
`171`	`173`
`172`		`-# ----------`
`173`		`-# Set up the GMAKE variable correctly.`
`174`		`-# ----------`
`175`		`-`
`176`		`-case$host_platformin`
`177`		`-beos)`
`178`		`- GMAKE=make;;`
`179`		`-*)`
`180`		`- GMAKE=gmake;;`
`181`		`-esac`
`182`		`-`
`183`	`174`
`184`	`175`	`# ----------`
`185`	`176`	`# Set backend timezone and datestyle explicitly`
`@@ -297,7 +288,7 @@ then`
`297`	`288`
`298`	`289`	`message"creating temporary installation"`
`299`	`290`	`mkdir -p"$LOGDIR"\|\| { (exit 2);exit; }`
`300`		`-${MAKE:-$GMAKE} -C"$top_builddir" DESTDIR="$temp_install" install>"$LOGDIR/install.log"2>&1`
	`291`	`+$GMAKE -C"$top_builddir" DESTDIR="$temp_install" install>"$LOGDIR/install.log"2>&1`
`301`	`292`
`302`	`293`	`if [$?-ne 0 ]`
`303`	`294`	`then`

Comments

(0)