From 4ab8e75a466234db954c36b296c25c1f0d610894 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 15 Jul 2000 08:05:12 +0000 Subject: [PATCH] Update. 2000-07-15 Ulrich Drepper * intl/Makefile (test-srcs): Add tst-translit. (tests): Likewise. Add rules to build and run tst-translit. * intl/tst-translit.c: New file. * intl/tst-translit.sh: New file. --- ChangeLog | 8 ++++++++ intl/Makefile | 13 +++++++++---- intl/tst-translit.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ intl/tst-translit.sh | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 intl/tst-translit.c create mode 100755 intl/tst-translit.sh diff --git a/ChangeLog b/ChangeLog index 26faaf9..86c1bb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-07-15 Ulrich Drepper + + * intl/Makefile (test-srcs): Add tst-translit. + (tests): Likewise. + Add rules to build and run tst-translit. + * intl/tst-translit.c: New file. + * intl/tst-translit.sh: New file. + 2000-07-14 Ulrich Drepper * iconv/loop.c (STANDARD_ERR_HANDLER): If one of the diff --git a/intl/Makefile b/intl/Makefile index 07108b1..b4bc7aa 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -27,7 +27,7 @@ routines = bindtextdom dcgettext dgettext gettext \ distribute = gettext.h gettextP.h hash-string.h loadinfo.h locale.alias \ plural.y po2test.sed tst-gettext.sh -test-srcs := tst-gettext +test-srcs := tst-gettext tst-translit before-compile = $(objpfx)msgs.h @@ -48,9 +48,13 @@ include ../Rules ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) ifneq ($(strip $(MSGFMT)),:) -.PHONY: do-gettext-test -tests: do-gettext-test -do-gettext-test: tst-gettext.sh $(objpfx)tst-gettext +.PHONY: do-gettext-test do-translit-test +tests: do-gettext-test do-translit-test +do-gettext-test: $(objpfx)tst-gettext.out +$(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext + $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + do-translit-test: $(objpfx)tst-translit.out +$(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ endif endif @@ -61,6 +65,7 @@ $(objpfx)msgs.h: po2test.sed ../po/de.po sed -f $^ > $@ CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\" +CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\" CPPFLAGS += -D'GNULOCALEDIR="$(msgcatdir)"' \ -D'LOCALE_ALIAS_PATH="$(msgcatdir):$(i18ndir)"' diff --git a/intl/tst-translit.c b/intl/tst-translit.c new file mode 100644 index 0000000..fbdaf52 --- /dev/null +++ b/intl/tst-translit.c @@ -0,0 +1,47 @@ +/* Test of translitation in the gettext functions. + Copyright (C) 2000 Free Software Foundation, Inc. + Contributed by Ulrich Drepper , 2000. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include + +int +main (void) +{ + int result = 0; + const char *s; + + setenv ("LANGUAGE", "existing-locale", 1); + textdomain ("translit"); + bindtextdomain ("translit", OBJPFX "domaindir"); + +#define TEST(in, exp) \ + s = gettext (in); \ + puts (s); \ + result |= strcmp (s, exp) != 0; + + TEST ("test", "???????"); + TEST ("test", "???????"); + TEST ("onemore", "?ssdf"); + TEST ("onemore", "?ssdf"); + TEST ("test", "???????"); + + return result; +} diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh new file mode 100755 index 0000000..78f7f1b --- /dev/null +++ b/intl/tst-translit.sh @@ -0,0 +1,38 @@ +#! /bin/sh +# Test of transliteration in gettext functions. +# Copyright (C) 2000 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If +# not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +common_objpfx=$1 +objpfx=$2 + +GCONV_PATH=${common_objpfx}iconvdata +export GCONV_PATH +LOCPATH=${common_objpfx}localedata +export LOCPATH +LC_ALL=C +export LC_ALL + +msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/translit.mo \ + translit.po + + +${common_objpfx}elf/ld.so --library-path $common_objpfx \ +${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir + +exit $? -- 2.7.4