From 8bf3ae46afb32ec2ef8bdd3bb2b5ae34000ce0f8 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Fri, 18 Jan 2008 20:48:56 +0000
Subject: Update to PostgreSQL 8.3RC2 and pgtcl 1.6.2.

---
 Makefile.regress | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'Makefile.regress')

diff --git a/Makefile.regress b/Makefile.regress
index df28c64..c722d29 100644
--- a/Makefile.regress
+++ b/Makefile.regress
@@ -3,24 +3,40 @@
 # in an RPM installation
 #
 
-# database encoding
-MULTIBYTE := SQL_ASCII
+# default encoding
+MULTIBYTE = SQL_ASCII
 
 # maximum simultaneous connections for parallel tests
-MAXCONNOPT :=
+MAXCONNOPT =
 ifdef MAX_CONNECTIONS
 MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
 endif
 
+# locale
+NOLOCALE =
+ifdef NO_LOCALE
+NOLOCALE += --no-locale
+endif
+
 srcdir := .
 
+# Test input and expected files.  These are created by pg_regress itself, so we
+# don't have a rule to create them.  We do need rules to clean them however.
+ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
+input_files  := $(foreach file, $(ifile_list), sql/$(file).sql)
+ofile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/output/*.source)))
+output_files := $(foreach file, $(ofile_list), expected/$(file).out)
+
+abs_srcdir := $(shell pwd)
+abs_builddir := $(shell pwd)
+
 check: installcheck-parallel
 
 installcheck: cleandirs
-	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
+	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
 
 installcheck-parallel: cleandirs
-	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT)
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
 
 # 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 +53,10 @@ runtest: installcheck
 runtest-parallel: installcheck-parallel
 
 bigtest: cleandirs
-	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
+	./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big
 
 bigcheck: cleandirs
-	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) numeric_big
+	./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
 
 
 ##
@@ -48,6 +64,7 @@ bigcheck: cleandirs
 ##
 
 clean distclean maintainer-clean:
+	rm -f $(output_files) $(input_files)
 	rm -rf testtablespace
 	rm -rf results tmp_check log
 	rm -f regression.diffs regression.out regress.out run_check.out
-- 
cgit