Remove all traces of multibyte and locale options. Clean up comments

referring to "multibyte" where it really means character encoding.

9 files changed, 12 insertions, 38 deletions

diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile
index 626c789a70..9a587b19cd 100644
--- a/src/test/locale/Makefile
+++ b/src/test/locale/Makefile
@@ -1,11 +1,11 @@
-# $Header: /cvsroot/pgsql/src/test/locale/Makefile,v 1.7 2001/01/19 19:15:33 petere Exp $
+# $Header: /cvsroot/pgsql/src/test/locale/Makefile,v 1.8 2002/09/03 21:45:44 petere Exp $
 
 subdir = src/test/locale
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-PROGS = test-pgsql-locale test-ctype
+PROGS = test-ctype
 DIRS = de_DE.ISO8859-1 gr_GR.ISO8859-7 koi8-r koi8-to-win1251
 
 all: $(PROGS)
diff --git a/src/test/locale/README b/src/test/locale/README
index ba0c455630..822aab238b 100644
--- a/src/test/locale/README
+++ b/src/test/locale/README
@@ -1,4 +1,4 @@
-$Header: /cvsroot/pgsql/src/test/locale/README,v 1.3 2001/01/19 19:43:27 petere Exp $
+$Header: /cvsroot/pgsql/src/test/locale/README,v 1.4 2002/09/03 21:45:44 petere Exp $
 
 This directory contains a set of tests for locales.  I provided one C
 program test-ctype.c to test CTYPE support in libc and the installed
@@ -11,11 +11,9 @@ for example
     gmake check-koi8-r
 
 Currently, there are only tests for a few locales available.  The script
-'runall' calls test-pgsql-locale to test whether locale support has been
-compiled into PostgreSQL, test-ctype to test libc and locale data,
-test-sort.pl (uncomment test-sort.py, if you have a Python interpreter
-installed), and does tests on PostgreSQL with the provided SQL script
-files.
+'runall' calls test-ctype to test libc and locale data, test-sort.pl
+(uncomment test-sort.py, if you have a Python interpreter installed), and
+does tests on PostgreSQL with the provided SQL script files.
 
 To add locale tests one needs to create a directory $locale and create
 a Makefile (and other files) similar to koi8-r/*.  Actually, the simplest
diff --git a/src/test/locale/de_DE.ISO8859-1/runall b/src/test/locale/de_DE.ISO8859-1/runall
index b682dc32a6..dda0305307 100755
--- a/src/test/locale/de_DE.ISO8859-1/runall
+++ b/src/test/locale/de_DE.ISO8859-1/runall
@@ -3,9 +3,6 @@
 PATH=..:$PATH
 
 echo "Testing PostgreSQL compilation..."
-if ! test-pgsql-locale; then
-   exit 1
-fi
 
 LC_CTYPE=de_DE.ISO8859-1
 LC_COLLATE=$LC_CTYPE
diff --git a/src/test/locale/gr_GR.ISO8859-7/runall b/src/test/locale/gr_GR.ISO8859-7/runall
index da7650bb7f..75c2c58732 100755
--- a/src/test/locale/gr_GR.ISO8859-7/runall
+++ b/src/test/locale/gr_GR.ISO8859-7/runall
@@ -3,9 +3,6 @@
 PATH=..:$PATH
 
 echo "Testing PostgreSQL compilation..."
-if ! test-pgsql-locale; then
-   exit 1
-fi
 
 LC_CTYPE=gr_GR.ISO8859-7
 LC_COLLATE=$LC_CTYPE
diff --git a/src/test/locale/koi8-r/runall b/src/test/locale/koi8-r/runall
index 2fb6a5de41..3dc7453c09 100755
--- a/src/test/locale/koi8-r/runall
+++ b/src/test/locale/koi8-r/runall
@@ -3,9 +3,6 @@
 PATH=..:$PATH
 
 echo "Testing PostgreSQL compilation..."
-if ! test-pgsql-locale; then
-   exit 1
-fi
 
 LC_CTYPE=ru_RU.KOI8-R
 LC_COLLATE=$LC_CTYPE
diff --git a/src/test/locale/koi8-to-win1251/runall b/src/test/locale/koi8-to-win1251/runall
index a9aeadfa47..b5a16493f9 100755
--- a/src/test/locale/koi8-to-win1251/runall
+++ b/src/test/locale/koi8-to-win1251/runall
@@ -3,9 +3,6 @@
 PATH=..:$PATH
 
 echo "Testing PostgreSQL compilation..."
-if ! test-pgsql-locale; then
-   exit 1
-fi
 
 LC_CTYPE=ru_RU.KOI8-R
 LC_COLLATE=$LC_CTYPE
diff --git a/src/test/locale/test-pgsql-locale.c b/src/test/locale/test-pgsql-locale.c
deleted file mode 100644
index 8369e671dd..0000000000
--- a/src/test/locale/test-pgsql-locale.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#include "postgres.h"
-
-int
-main()
-{
-#ifdef USE_LOCALE
-	printf("PostgreSQL compiled with locale support\n");
-	return 0;
-#else
-	printf("PostgreSQL compiled without locale support\n");
-	return 1;
-#endif
-}
diff --git a/src/test/mb/README b/src/test/mb/README
index 50797f831a..beb580a0d8 100644
--- a/src/test/mb/README
+++ b/src/test/mb/README
@@ -1,9 +1,8 @@
-README for MB(multi-byte) regression test
+README for multibyte regression test
 							1998/7/22
 							Tatsuo Ishii
 
-This directory contains a set of tests for MB(multi-byte) supporting
+This directory contains a set of tests for multibyte supporting
 extentions for PostgreSQL. To run the test, simply type:
 
 % mbregress.sh
-
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 1e222b3b76..009fb35efa 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.38 2002/07/02 05:43:34 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.39 2002/09/03 21:45:44 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,6 +22,9 @@ override CFLAGS += $(CFLAGS_SL)
 
 override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
 
+# default encoding
+MULTIBYTE = SQL_ASCII
+
 
 ##
 ## Prepare for tests