diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-05-04 18:33:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-05-04 18:33:36 +0000 |
| commit | f6cc6cdf0b94eb1608ceeabcab2450c8cd4054a4 (patch) | |
| tree | 01abe7e7555ee0d87db36c06881902ac01af2333 /intl | |
| parent | e759ccae887cac69cd47b878c67eba5dd1934f56 (diff) | |
| download | glibc-f6cc6cdf0b94eb1608ceeabcab2450c8cd4054a4.tar.gz glibc-f6cc6cdf0b94eb1608ceeabcab2450c8cd4054a4.tar.xz glibc-f6cc6cdf0b94eb1608ceeabcab2450c8cd4054a4.zip | |
Updated to fedora-glibc-20050504T1818
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/Makefile | 4 | ||||
| -rw-r--r-- | intl/tst-gettext2.sh | 4 | ||||
| -rwxr-xr-x | intl/tst-gettext4.sh | 14 | ||||
| -rwxr-xr-x | intl/tst-gettext5.sh | 11 | ||||
| -rwxr-xr-x | intl/tst-translit.sh | 5 |
5 files changed, 17 insertions, 21 deletions
diff --git a/intl/Makefile b/intl/Makefile index 19853974d7..9da445aa38 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -87,9 +87,9 @@ $(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset $(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3 $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4 - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ $(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5 - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/ endif endif diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh index 53f081a798..68157f8a68 100644 --- a/intl/tst-gettext2.sh +++ b/intl/tst-gettext2.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test of gettext functions. -# Copyright (C) 2000, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -26,7 +26,7 @@ LC_ALL=C export LC_ALL # Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir +mkdir -p ${objpfx}domaindir # Create the locale directories. test -d ${objpfx}domaindir/lang1 || { mkdir ${objpfx}domaindir/lang1 diff --git a/intl/tst-gettext4.sh b/intl/tst-gettext4.sh index 8acdd37882..68779be04d 100755 --- a/intl/tst-gettext4.sh +++ b/intl/tst-gettext4.sh @@ -21,18 +21,15 @@ # 02111-1307 USA. common_objpfx=$1 -objpfx=$2 +run_program_prefix=$2 +objpfx=$3 LC_ALL=C export LC_ALL -# Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir # Create the domain directories. -test -d ${objpfx}domaindir/de_DE || mkdir ${objpfx}domaindir/de_DE -test -d ${objpfx}domaindir/de_DE/LC_MESSAGES || mkdir ${objpfx}domaindir/de_DE/LC_MESSAGES -test -d ${objpfx}domaindir/fr_FR || mkdir ${objpfx}domaindir/fr_FR -test -d ${objpfx}domaindir/fr_FR/LC_MESSAGES || mkdir ${objpfx}domaindir/fr_FR/LC_MESSAGES +mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES +mkdir -p ${objpfx}domaindir/fr_FR/LC_MESSAGES # Populate them. msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/multithread.mo tst-gettext4-de.po msgfmt -o ${objpfx}domaindir/fr_FR/LC_MESSAGES/multithread.mo tst-gettext4-fr.po @@ -42,7 +39,6 @@ export GCONV_PATH LOCPATH=${common_objpfx}localedata export LOCPATH -${common_objpfx}elf/ld.so --library-path $common_objpfx \ -${objpfx}tst-gettext4 > ${objpfx}tst-gettext4.out +${run_program_prefix} ${objpfx}tst-gettext4 > ${objpfx}tst-gettext4.out exit $? diff --git a/intl/tst-gettext5.sh b/intl/tst-gettext5.sh index bbc58e796f..8c8d2170e4 100755 --- a/intl/tst-gettext5.sh +++ b/intl/tst-gettext5.sh @@ -22,16 +22,14 @@ # 02111-1307 USA. common_objpfx=$1 -objpfx=$2 +run_program_prefix=$2 +objpfx=$3 LC_ALL=C export LC_ALL -# Generate the test data. -test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir # Create the domain directories. -test -d ${objpfx}domaindir/de_DE || mkdir ${objpfx}domaindir/de_DE -test -d ${objpfx}domaindir/de_DE/LC_MESSAGES || mkdir ${objpfx}domaindir/de_DE/LC_MESSAGES +mkdir -p ${objpfx}domaindir/de_DE/LC_MESSAGES # Populate them. msgfmt -o ${objpfx}domaindir/de_DE/LC_MESSAGES/codeset.mo tstcodeset.po @@ -40,7 +38,6 @@ export GCONV_PATH LOCPATH=${common_objpfx}localedata export LOCPATH -${common_objpfx}elf/ld.so --library-path $common_objpfx \ -${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out +${run_program_prefix} ${objpfx}tst-gettext5 > ${objpfx}tst-gettext5.out exit $? diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh index e2508df4df..22826e996c 100755 --- a/intl/tst-translit.sh +++ b/intl/tst-translit.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test of transliteration in gettext functions. -# Copyright (C) 2000, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -25,6 +25,9 @@ objpfx=$2 LC_ALL=C export LC_ALL +# Create the locale directories. +mkdir -p ${objpfx}localedir/existing-locale/LC_MESSAGES + msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/translit.mo \ translit.po |