[csw-devel] SF.net SVN: gar:[16471] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos

guengel at users.sourceforge.net guengel at users.sourceforge.net
Mon Dec 12 12:25:34 CET 2011 

Revision: 16471
          http://gar.svn.sourceforge.net/gar/?rev=16471&view=rev
Author:   guengel
Date:     2011-12-12 11:25:34 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: pgsql tests will be performed in a local directory (due to NFS issues). Development package renamed.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-12 11:11:03 UTC (rev 16470)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-12 11:25:34 UTC (rev 16471)
@@ -76,6 +76,14 @@
 #    them in the proper place.
 #
 # 8. Make sure the proper version numbers are used for the library packages.
+#
+#
+# Note 5: Development package
+# ------
+#
+# The development package is not versioned, i.e. named CSW$(NAME)-dev,
+# since we can only support one set of header files with a reasonable
+# amount of effort.
 
 
 # This BUILD is NOT READY!  It needs work before it's usable.
@@ -196,6 +204,9 @@
 # This patch will replace /usr/local/include by /opt/csw/include in
 # ecpg.c and thus silence a checkpkg error.
 PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch
+# Test running on a NFS may fail. Thus we let the test run in
+# /var/tmp/pgsql/tmp_check
+PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -288,28 +299,28 @@
 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,$(BUILD_ISAS), contrib_$(i))
 
-PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-dev
-SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = PostgreSQL $(VERSION), Development Files
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev  = .*/pgxs/.*
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/man5/.*
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.*
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg-compat3
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg6
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpq5
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpgtypes3
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgnugetopt0
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWosslrt
+PACKAGES += CSW$(NAME)-dev
+SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files
+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 += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.*
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt
 # Those '/usr/local' are ok, they are in a HPUX section of the file
-CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
-#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i))
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
+#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i))
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	2011-12-12 11:25:34 UTC (rev 16471)
@@ -0,0 +1,45 @@
+From bcfc4c25ea42d70719bc62a9674b2832b106f466 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sat, 10 Dec 2011 16:41:08 +0100
+Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
+
+---
+ src/test/regress/GNUmakefile |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index da117dc..471cef8 100644
+--- a/src/test/regress/GNUmakefile
++++ b/src/test/regress/GNUmakefile
+@@ -141,7 +141,8 @@ tablespace-setup:
+ ##
+ 
+ check: all
+-	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
++	install -d /var/tmp/pgsql/tmp_check
++	./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
+ 
+ installcheck: all
+ 	./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+@@ -160,7 +161,8 @@ bigtest: all
+ 	./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big 
+ 
+ bigcheck: all
+-	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
++	install -d /var/tmp/pgsql/tmp_check
++	./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
+ 
+ 
+ ##
+@@ -174,7 +176,7 @@ clean distclean maintainer-clean: clean-lib
+ 	rm -f $(output_files) $(input_files) pg_regress_main.o pg_regress.o pg_regress$(X)
+ # things created by various check targets
+ 	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
+ ifeq ($(PORTNAME), cygwin)
+ 	rm -f regress.def
+-- 
+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