summaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-27 05:05:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-27 05:05:12 +0000
commit70e51ab9f37ec84b23ff5e090e0d9a322baf523d (patch)
tree1891740b82b92c022c072834b979196199ae0b93 /localedata
parentc392db7c4be39bf2ad8668f6e75a1ec219da6b0e (diff)
downloadglibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.gz
Update.
* locale/programs/ld-collate.c (collate_output): Don't start with empty extrapool and indirectpool obstacks since we need the offsets to be nonzero. (collate_read): Call load_locale, not find_locale. * locale/programs/ld-ctype.c (ctype_finish): If LC_CTYPE category wasn't defined in the file also initialize repertoire if possible. * locale/programs/ld-time.c (time_finish): Fix message string. * locale/programs/linereader.c: Cast parameters of lr_error to correct type to prevnet warning. * locale/programs/localedef.c (load_locale): New file. * locale/programs/localedef.h: Add its prototype. * locale/programs/repertoire.c (repertoire_new_char): Add missing parameters to lr_error call. * localedata/Makefile: Enable running tests again. * localedata/tests/test2.def: Adjust syntax to new specification. * localedata/tests/test3.def: Likewise. * localedata/tst-trans.sh: Redirect output of program into file. * string/strcoll.c: Fix many error in new implementation to make it pass (at least) the test suite. * locale/Makefile: Don't link localedef statically anymore. * locale/ld-collate.c (struct element_t): Add field is_character and use it to distinguish real character from collating elements and symbols. * locale/programs/ld-time.c: Likewise.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/Makefile2
-rw-r--r--localedata/tests/test2.def2
-rw-r--r--localedata/tests/test3.def2
-rwxr-xr-xlocaledata/tst-trans.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/localedata/Makefile b/localedata/Makefile
index 1189723988..6433e374ea 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -72,7 +72,7 @@ $(inst_i18ndir)/repertoiremaps/%: repertoiremaps/% $(+force); $(do-install)
ifeq (no,$(cross-compiling))
ifeq (yes,$(build-shared))
.PHONY: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch do-tst-trans
-#tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch do-tst-trans
+tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch do-tst-trans
do-collate-test: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
$(test-input-data)
$(SHELL) -e $< $(common-objpfx) $(test-input)
diff --git a/localedata/tests/test2.def b/localedata/tests/test2.def
index 995daf1776..9d252d7403 100644
--- a/localedata/tests/test2.def
+++ b/localedata/tests/test2.def
@@ -4,6 +4,6 @@ upper <A>
lower <a>
space <SP>
blank <SP>
-alpha <A>;<a>;<b01>;...;<b03>
+alpha <A>;<a>;<b01>..<b03>
END LC_CTYPE
diff --git a/localedata/tests/test3.def b/localedata/tests/test3.def
index 56dea5c4bb..53a7bbcd9d 100644
--- a/localedata/tests/test3.def
+++ b/localedata/tests/test3.def
@@ -4,6 +4,6 @@ upper <A>
lower <a>
space <SP>
blank <SP>
-alpha <A>;<a>;<b1>;...;<b3>
+alpha <A>;<a>;<b1>..<b3>
END LC_CTYPE
diff --git a/localedata/tst-trans.sh b/localedata/tst-trans.sh
index c95f2236b4..b1245940ff 100755
--- a/localedata/tst-trans.sh
+++ b/localedata/tst-trans.sh
@@ -31,6 +31,6 @@ exit 1
# Run the test program.
LOCPATH=${common_objpfx}localedata LC_ALL=tt_TT \
${common_objpfx}elf/ld.so --library-path $common_objpfx \
-${common_objpfx}localedata/tst-trans
+${common_objpfx}localedata/tst-trans > ${common_objpfx}localedata/tst-trans.out
exit $?