[csw-devel] SF.net SVN: gar:[16629] csw/mgar/pkg/postgresql/branches
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sat Dec 31 12:04:47 CET 2011
Revision: 16629
http://gar.svn.sourceforge.net/gar/?rev=16629&view=rev
Author: guengel
Date: 2011-12-31 11:04:47 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-9.1-raos: Branched to version 9.1. Took new extension management into account. man5 now goes into doc.
Modified Paths:
--------------
csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile
csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums
csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
Added Paths:
-----------
csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 17:29:31 UTC (rev 16626)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile 2011-12-31 11:04:47 UTC (rev 16629)
@@ -88,10 +88,10 @@
NAME = postgresql
-BASE_VERSION = 9.0
+BASE_VERSION = 9.1
VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 6
+PATCHLEVEL = 2
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = apps
@@ -120,8 +120,8 @@
# 8.4 has removed ipcclean
BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres
BIN_NAMES_DEVEL = ecpg pg_config
-BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb
-BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup
+BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb pg_basebackup clusterdb
+BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync
# These are shared objects used by the server. Please note, contrib installs
# also shared object in the same place, so make sure you don't mix up things
SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so
@@ -133,6 +133,10 @@
SO_NAMES_SERVER += utf8_and_johab.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so
# This has been introduced with 9.0
SO_NAMES_SERVER += libpqwalreceiver.so
+# Those are the extension provided by the server.
+#
+# This has been introduced with 9.1
+EXT_NAMES_SERVER = plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql plpgsql.control
# These are shared object used by contrib. Please note, the server installs
# also shared object in the same place, so make sure you don't mix up things
SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so passwordcheck.so
@@ -141,7 +145,49 @@
SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so
SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so
SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so
-SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so
+SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so dummy_seclabel.so
+SO_NAMES_CONTRIB += auth_delay.so file_fdw.so
+# Those are the extension provided by contrib.
+#
+# This has been introduced with 9.1
+EXT_NAMES_CONTRIB = adminpack--1.0.sql adminpack.control
+EXT_NAMES_CONTRIB += autoinc--1.0.sql autoinc.control autoinc--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += btree_gin--1.0.sql btree_gin.control btree_gin--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += btree_gist--1.0.sql btree_gist.control btree_gist--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += chkpass--1.0.sql chkpass.control chkpass--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += citext--1.0.sql citext.control citext--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += cube--1.0.sql cube.control cube--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += dblink--1.0.sql dblink.control dblink--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += dict_int--1.0.sql dict_int.control dict_int--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += dict_xsyn--1.0.sql dict_xsyn.control dict_xsyn--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += earthdistance--1.0.sql earthdistance.control earthdistance--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += file_fdw--1.0.sql file_fdw.control
+EXT_NAMES_CONTRIB += fuzzystrmatch--1.0.sql fuzzystrmatch.control fuzzystrmatch--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += hstore--1.0.sql hstore.control hstore--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += insert_username--1.0.sql insert_username.control insert_username--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += intagg--1.0.sql intagg.control intagg--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += intarray--1.0.sql intarray.control intarray--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += isn--1.0.sql isn.control isn--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += lo--1.0.sql lo.control lo--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += ltree--1.0.sql ltree.control ltree--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += moddatetime--1.0.sql moddatetime.control moddatetime--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pageinspect--1.0.sql pageinspect.control pageinspect--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pg_buffercache--1.0.sql pg_buffercache.control pg_buffercache--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pgcrypto--1.0.sql pgcrypto.control pgcrypto--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pg_freespacemap--1.0.sql pg_freespacemap.control pg_freespacemap--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pgrowlocks--1.0.sql pgrowlocks.control pgrowlocks--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pg_stat_statements--1.0.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pgstattuple--1.0.sql pgstattuple.control pgstattuple--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += pg_trgm--1.0.sql pg_trgm.control pg_trgm--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += refint--1.0.sql refint.control refint--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += seg--1.0.sql seg.control seg--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += sslinfo--1.0.sql sslinfo.control sslinfo--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += tablefunc--1.0.sql tablefunc.control tablefunc--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += test_parser--1.0.sql test_parser.control test_parser--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += timetravel--1.0.sql timetravel.control timetravel--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += tsearch2--1.0.sql tsearch2.control tsearch2--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += unaccent--1.0.sql unaccent.control unaccent--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB += xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql
# Miscellaneous files
MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql
MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql
@@ -256,6 +302,7 @@
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(EXT_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.*
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.*
@@ -274,9 +321,6 @@
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2
-CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) )
-# This one isn't covered by the above.
-CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so
#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i))
PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client
@@ -302,7 +346,11 @@
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$)
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(EXT_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.*
+# This has been removed as of 9.1
+#PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.*
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.*
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg
PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW
@@ -314,8 +362,6 @@
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2
RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6
-# This will produce some 'unused overrides'.
-CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) )
#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i))
PACKAGES += CSW$(NAME)-dev
@@ -323,8 +369,7 @@
PKGFILES_CSW$(NAME)-dev = .*/pgxs/.*
PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
-PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
-PKGFILES_CSW$(NAME)-dev += .*/man5/.*
+PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
# Alternatives for -dev have no version appended
PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
@@ -349,8 +394,10 @@
PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.*
+
PACKAGES += CSWlibecpg-compat3
SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat
PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3)
@@ -384,6 +431,9 @@
BUILD_DEP_PKGS += CSWlibz-dev
BUILD_DEP_PKGS += CSWlibgnugetopt-dev
+# See comment on the test-custom target.
+TEST_SCRIPTS = custom
+
EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST
# Needed for thread safety check by configure
LIBS = -lrt
@@ -416,6 +466,13 @@
#SKIPTEST ?= 1
include gar/category.mk
+
+# If the check is not called from within the $(WORKSRC) dir, it
+# fails...
+test-custom:
+ cd $(WORKSRC) ; $(BUILD_ENV) gmake check
+ @$(MAKECOOKIE)
+
# This will generate the ALTERNATIVEs for the binaries in
# $(libexecdir)/postgresql/XY.
#
@@ -487,10 +544,22 @@
$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) )
# Create the PGDATA directory
ginstall -d $(PKGROOT)$(PGDATA)
-# Adjust the man page names for man1
- for f in $(PKGROOT)$(datadir)/man/man1/* ; do \
- f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \
- mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \
+# Adjust the man page names.
+ for i in 1 5 ; do \
+ test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
+ for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
+ suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
+ f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \
+ dont_move=0 ; \
+ for d in $(BIN_NAMES_DEVEL) ; do \
+ bname="`basename $${f_no_suffix}`" ; \
+ if test "$${bname}" = "$$d" ; then \
+ dont_move=1 ; \
+ break ; \
+ fi ; \
+ done ; \
+ test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+ done ;\
done
# Change path names in documentation
for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
@@ -566,6 +635,14 @@
exit 1 ; \
fi ; \
done
+ for n in $(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB) ; do \
+ if [ -f $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/$$n ] ; then\
+ : ; \
+ else \
+ echo "Extra extension defined $$n" ; \
+ exit 1 ; \
+ fi ; \
+ done
# Check if all binaries and libraries in the pkgroot are contained in
# the respective recipe variables.
for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
@@ -573,7 +650,7 @@
if [ $$? -eq 0 ] ; then \
: ; \
else \
- echo "Binary `basename $$n` not defined" ; \
+ echo "Binary `basename $$n` not defined in recipe" ; \
exit 1 ; \
fi ; \
done
@@ -582,7 +659,16 @@
if [ $$? -eq 0 ] ; then \
: ; \
else \
- echo "Library `basename $$n` not defined" ; \
+ echo "Library `basename $$n` not defined in recipe" ; \
exit 1 ; \
fi ; \
done
+ for n in `gfind $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension -maxdepth 1 -type f` ; do \
+ echo "$(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+ if [ $$? -eq 0 ] ; then \
+ : ; \
+ else \
+ echo "Extension `basename $$n` not defined in recipe" ; \
+ exit 1 ; \
+ fi ; \
+ done
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums 2011-12-30 17:29:31 UTC (rev 16626)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums 2011-12-31 11:04:47 UTC (rev 16629)
@@ -1 +1 @@
-4ad7e4fc31ef8b8a75a3e4243933963f postgresql-9.0.6.tar.bz2
+7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-31 11:04:47 UTC (rev 16629)
@@ -1,43 +1,62 @@
-From 6087958b802424f91462b3a98cf75bc0d3471e09 Mon Sep 17 00:00:00 2001
+From 051eb505448cba2f98aa5926ef3bfe0eed50d74c Mon Sep 17 00:00:00 2001
From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Fri, 30 Dec 2011 16:33:54 +0100
+Date: Fri, 30 Dec 2011 20:32:11 +0100
Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
---
- src/test/regress/GNUmakefile | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+ src/Makefile.global.in | 4 ++--
+ src/test/regress/GNUmakefile | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 3bf658d..69523de 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -438,10 +438,10 @@ endif
+
+ pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
+
+-pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags)
++pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags)
+ pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags)
+
+-pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
++pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check log/
+
+
+ ##########################################################################
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 31762b8..ffe0667 100644
+index 90aea6c..99c3905 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
-@@ -141,7 +141,8 @@ tablespace-setup:
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE)
+@@ -135,6 +135,7 @@ tablespace-setup:
+ REGRESS_OPTS = --dlpath=.
- check: all
-- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+ check: all tablespace-setup
+ install -d /var/tmp/pgsql/tmp_check
-+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+ $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
- installcheck: all
- $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule
-@@ -162,7 +163,8 @@ bigtest: all
- $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big
+ installcheck: all tablespace-setup
+@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup
+ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
- bigcheck: all
-- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+ standbycheck: all
+ install -d /var/tmp/pgsql/tmp_check
-+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing
+ # old interfaces follow...
+@@ -153,9 +155,11 @@ runtest: installcheck
+ runtest-parallel: installcheck-parallel
- ##
-@@ -175,5 +177,5 @@ clean distclean maintainer-clean: clean-lib
- # things created by various check targets
- rm -f $(output_files) $(input_files)
- rm -rf testtablespace
-- rm -rf results tmp_check log
-+ rm -rf results /var/tmp/pgsql/tmp_check log
- rm -f regression.diffs regression.out regress.out run_check.out
+ bigtest: all tablespace-setup
++ install -d /var/tmp/pgsql/tmp_check
+ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
+
+ bigcheck: all tablespace-setup
++ install -d /var/tmp/pgsql/tmp_check
+ $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+
+
--
1.7.6.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list