diff options
| author | Tom Lane | 2006-07-21 00:24:04 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-07-21 00:24:04 +0000 |
| commit | bc660c423731a3b68fb9c1e61a3ab8812dc8d55d (patch) | |
| tree | 635fde8b69f31637743b6db10fc2a2019af0ac8a /src/pl | |
| parent | 9652b79ae417cd10aa611b3cfdc9c8e6225555cc (diff) | |
Ah, I finally realize why Magnus wanted to add a --bindir option to
pg_regress: there's no other way to cope with testing a relocated
installation. Seems better to call it --psqldir though, since the
only thing we need to find in that case is psql. It'd be better if
we could use find_other_exec, but that's not happening unless we are
willing to install pg_regress alongside psql, which seems unlikely
to happen.
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 6 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 6 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 73f36bd44ac..11583763ff9 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.27 2006/07/19 02:37:00 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.28 2006/07/21 00:24:04 tgl Exp $ subdir = src/pl/plperl top_builddir = ../../.. @@ -38,6 +38,8 @@ SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS) REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl REGRESS = plperl plperl_trigger plperl_shared plperl_elog +# where to find psql for running the tests +PSQLDIR = $(bindir) include $(top_srcdir)/src/Makefile.shlib @@ -84,7 +86,7 @@ uninstall: rm -f '$(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)' installcheck: submake - $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 5823e205dcd..9d02f4d7f41 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.25 2006/07/19 02:37:00 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.26 2006/07/21 00:24:04 tgl Exp $ subdir = src/pl/plpython top_builddir = ../../.. @@ -60,6 +60,8 @@ 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 +# where to find psql for running the tests +PSQLDIR = $(bindir) include $(top_srcdir)/src/Makefile.shlib @@ -103,7 +105,7 @@ uninstall: rm -f '$(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)' installcheck: submake - $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index a474c71e2d9..6fc6cc272ff 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.49 2006/07/19 02:37:00 tgl Exp $ +# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.50 2006/07/21 00:24:04 tgl Exp $ # #------------------------------------------------------------------------- @@ -42,6 +42,8 @@ OBJS = pltcl.o REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=pltcl REGRESS = pltcl_setup pltcl_queries +# where to find psql for running the tests +PSQLDIR = $(bindir) include $(top_srcdir)/src/Makefile.shlib @@ -90,7 +92,7 @@ uninstall: $(MAKE) -C modules $@ installcheck: submake - $(top_builddir)/src/test/regress/pg_regress $(REGRESS_OPTS) $(REGRESS) + $(top_builddir)/src/test/regress/pg_regress --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) .PHONY: submake submake: |