diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 5 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 8 | ||||
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 5 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 5 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 5 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 6 |
6 files changed, 22 insertions, 12 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 475902bc470..3bc7cfbbc53 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.213 2005/03/25 23:22:53 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.214 2005/05/17 18:26:22 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -228,6 +228,9 @@ XGETTEXT = @XGETTEXT@ GZIP = gzip BZIP2 = bzip2 +PL_TESTDB = pl_regression +CONTRIB_TESTDB = contrib_regression + # Installation. INSTALL = $(SHELL) $(top_srcdir)/config/install-sh -c diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 4f584ff02d4..c00c9674e4a 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -1,6 +1,6 @@ # PGXS: PostgreSQL extensions makefile -# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.3 2004/10/10 16:13:03 tgl Exp $ +# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.4 2005/05/17 18:26:22 tgl Exp $ # This file contains generic rules to build many kinds of simple # extension modules. You only need to set a few variables and include @@ -224,12 +224,12 @@ submake: # against installed postmaster installcheck: submake - $(top_builddir)/src/test/regress/pg_regress $(REGRESS) + $(SHELL) $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) # in-tree test doesn't work yet (no way to install my shared library) #check: all submake -# $(top_builddir)/src/test/regress/pg_regress --temp-install \ -# --top-builddir=$(top_builddir) $(REGRESS) +# $(SHELL) $(top_builddir)/src/test/regress/pg_regress --temp-install \ +# --top-builddir=$(top_builddir) $(REGRESS_OPTS) $(REGRESS) check: @echo "'make check' is not supported." @echo "Do 'make install', then 'make installcheck' instead." diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 6a0d8fa9edf..509c4634b3e 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -1,5 +1,5 @@ # Makefile for PL/Perl -# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.19 2005/05/14 17:55:20 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.20 2005/05/17 18:26:22 tgl Exp $ subdir = src/pl/plperl top_builddir = ../../.. @@ -36,6 +36,7 @@ OBJS = plperl.o spi_internal.o SPI.o SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS) +REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl REGRESS = plperl include $(top_srcdir)/src/Makefile.shlib @@ -62,7 +63,7 @@ uninstall: rm -f $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX) installcheck: submake - $(SHELL) $(top_builddir)/src/test/regress/pg_regress --load-language=plperl $(REGRESS) + $(SHELL) $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index e6f9a39e8f0..3720dc3cef0 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.19 2005/05/14 17:55:21 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.20 2005/05/17 18:26:23 tgl Exp $ subdir = src/pl/plpython top_builddir = ../../.. @@ -58,6 +58,7 @@ endif SHLIB_LINK = $(BE_DLLLIBS) $(python_libspec) $(python_additional_libs) +REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plpythonu REGRESS = plpython_schema plpython_populate plpython_function plpython_test plpython_error plpython_drop include $(top_srcdir)/src/Makefile.shlib @@ -81,7 +82,7 @@ uninstall: rm -f $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX) installcheck: submake - $(SHELL) $(top_builddir)/src/test/regress/pg_regress --load-language=plpythonu $(REGRESS) + $(SHELL) $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index ff65b0e020e..6b7764e942a 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.45 2005/05/14 17:55:22 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.46 2005/05/17 18:26:23 tgl Exp $ # #------------------------------------------------------------------------- @@ -40,6 +40,7 @@ SO_MAJOR_VERSION = 2 SO_MINOR_VERSION = 0 OBJS = pltcl.o +REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=pltcl REGRESS = pltcl_setup pltcl_queries include $(top_srcdir)/src/Makefile.shlib @@ -68,7 +69,7 @@ uninstall: $(MAKE) -C modules $@ installcheck: submake - $(SHELL) $(top_builddir)/src/test/regress/pg_regress --load-language=pltcl $(REGRESS) + $(SHELL) $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index f637bb659e8..f08d591b691 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.54 2005/05/11 21:52:03 tgl Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.55 2005/05/17 18:26:23 tgl Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -11,6 +11,7 @@ PostgreSQL regression test driver Usage: $me [options...] [extra tests...] Options: + --dbname=DB use database DB (default \`regression') --debug turn on debug mode in programs that are run --inputdir=DIR take input files from DIR (default \`.') --load-language=lang load the named language before running the @@ -123,6 +124,9 @@ do --version) echo "pg_regress (PostgreSQL @VERSION@)" exit 0;; + --dbname=*) + dbname=`expr "x$1" : "x--dbname=\(.*\)"` + shift;; --debug) debug=yes shift;; |