Fix pg_config.h, also update postgresql-test Makefile to work with 8.1.

This commit is contained in:
Tom Lane 2005-12-15 19:38:07 +00:00
parent d644a0e2b0
commit fc98a4f609
3 changed files with 19 additions and 21 deletions

View File

@ -17,10 +17,10 @@ srcdir := .
check: installcheck-parallel
installcheck: cleandirs
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
installcheck-parallel: cleandirs
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
# The tests command the server to write into testtablespace and results.
# On a SELinux-enabled system this will fail unless we mark those directories
@ -37,10 +37,10 @@ runtest: installcheck
runtest-parallel: installcheck-parallel
bigtest: cleandirs
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
bigcheck: cleandirs
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) numeric_big
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
##

View File

@ -7,24 +7,18 @@
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
#ifdef __i386__
#include "pg_config_i386.h"
#endif
#ifdef __x86_64__
#if defined(__x86_64__)
#include "pg_config_x86_64.h"
#endif
#ifdef __ia64__
#elif defined(__ia64__)
#include "pg_config_ia64.h"
#endif
#ifdef __ppc__
#include "pg_config_ppc.h"
#endif
#ifdef __ppc64__
#elif defined(__i386__)
#include "pg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "pg_config_ppc64.h"
#endif
#ifdef __s390__
#elif defined(__ppc__) || defined(__powerpc__)
#include "pg_config_ppc.h"
#elif defined(__s390x__)
#include "pg_config_s390x.h"
#elif defined(__s390__)
#include "pg_config_s390.h"
#endif
#ifdef __s390x__
#include "pg_config_s390x.h"
#endif

View File

@ -82,7 +82,7 @@
Summary: PostgreSQL client programs and libraries.
Name: postgresql
Version: 8.1.1
Release: 2
Release: 3
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@ -816,6 +816,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 8.1.1-3
- fix pg_config.h for 64-bit and ppc platforms
- update Makefile.regress (needs to --load-language=plpgsql)
* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 8.1.1-2
- oops, looks like we want uname -i not uname -m