From 9f835f5fb48eb6e173a7ca3c678595dba28c5e7a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Jul 2000 20:06:44 +0000 Subject: Update. 2000-07-12 Bruno Haible * iconv/gconv_open.c (__gconv_open): Merge duplicated code. 2000-07-12 Bruno Haible * iconv/gconv_builtin.c (__gconv_get_builtin_trans): Initialize __modname. 2000-07-12 Bruno Haible * iconv/gconv_open.c (__gconv_open): Initialize result->__steps[cnt].__data. 2000-07-12 Mark Kettenis * nss/getent.c (services_keys): Pass port number in network byte order in call to getservbyport. 2000-07-11 Andreas Jaeger * stdlib/Makefile (test-canon-ARGS): Fix for building in the source dir. * intl/Makefile (do-gettext-test): Likewise. * dirent/Makefile (opendir-tst1-ARGS): Likewise. 2000-07-11 Andreas Schwab * Makeconfig (run-program-prefix): New rule. (built-program-cmd): Use run-program-prefix. --- localedata/Makefile | 24 ++++++++++-------------- localedata/gen-locale.sh | 9 +++++---- localedata/sort-test.sh | 5 +++-- localedata/tst-ctype.sh | 4 ++-- localedata/tst-fmon.sh | 13 ++++++------- localedata/tst-locale.sh | 4 ++-- localedata/tst-mbswcs.sh | 16 ++++++---------- localedata/tst-rpmatch.sh | 8 ++++---- localedata/tst-trans.sh | 5 +++-- 9 files changed, 41 insertions(+), 47 deletions(-) (limited to 'localedata') diff --git a/localedata/Makefile b/localedata/Makefile index c9905a5..cd6e39d 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -76,7 +76,6 @@ distribute := CHECKSUMS README SUPPORTED ChangeLog \ include ../Makeconfig ifeq (no,$(cross-compiling)) -ifeq (yes,$(build-shared)) locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tst_iswctype tst_iswdigit tst_iswgraph \ tst_iswlower tst_iswprint tst_iswpunct \ @@ -94,7 +93,6 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tests = $(locale_test_suite) endif -endif # Files to install. install-others := $(addprefix $(inst_i18ndir)/, $(charmaps) $(locales) \ @@ -117,7 +115,6 @@ CFLAGS-tst-trans.c = -Wno-format ifeq (no,$(cross-compiling)) -ifeq (yes,$(build-shared)) # We have to generate locales LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ en_US.ISO-8859-1 ja_JP.EUC-JP @@ -130,9 +127,9 @@ generated-dirs += $(LOCALES) # Dependency for the locale files. We actually make it depend only on # one of the files. $(addprefix $(objpfx),$(CTYPE_FILES)): %: \ - gen-locale.sh Makefile $(common-objpfx)locale/localedef \ + gen-locale.sh $(common-objpfx)locale/localedef Makefile \ $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) - @$(SHELL) -e gen-locale.sh $(common-objpfx) $@ + @$(SHELL) -e gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@ $(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite))): %: \ $(addprefix $(objpfx),$(CTYPE_FILES)) @@ -143,27 +140,26 @@ tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch do-tst-trans \ do-tst-mbswcs do-tst-ctype do-collate-test: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \ $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) $(test-input) + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) do-tst-fmon: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data do-collate-test \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) tst-fmon.data -do-tst-locale: tst-locale.sh $(ld-test-srcs) \ + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data +do-tst-locale: tst-locale.sh $(common-objpfx)locale/localedef $(ld-test-srcs) \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) + $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) + $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' do-tst-trans: tst-trans.sh $(objpfx)tst-trans \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' do-tst-mbswcs: tst-mbswcs.sh $(objpfx)tst-mbswcs1 $(objpfx)tst-mbswcs2 \ $(objpfx)tst-mbswcs3 $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) + $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' do-tst-ctype: tst-ctype.sh $(objpfx)tst-ctype do-collate-test \ $(addprefix $(objpfx),$(CTYPE_FILES)) - $(SHELL) -e $< $(common-objpfx) -endif + $(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' endif # Sometimes the whole collection of locale files should be installed. diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index b68e364..386665c 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -19,6 +19,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx="$1"; shift +localedef="$1"; shift locfile="$1"; shift generate_locale () @@ -27,8 +28,7 @@ generate_locale () input=$2 out=$3 I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \ + ${localedef} --quiet -c -f $charmap -i $input \ ${common_objpfx}localedata/$out if [ $? -ne 0 ]; then @@ -38,8 +38,9 @@ generate_locale () fi } -locale=`echo $locfile|sed 's|.*/\([^/.]*\)[.].*/LC_CTYPE|\1|'` -charmap=`echo $locfile|sed 's|.*/[^/.]*[.]\(.*\)/LC_CTYPE|\1|'` +locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'` +locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'` +charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'` echo "Generating locale $locale.$charmap: this might take a while..." generate_locale $charmap $locale $locale.$charmap diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 18dbcd5..6c22524 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -1,6 +1,7 @@ #! /bin/sh common_objpfx=$1; shift +run_program_prefix=$1; shift lang=$* id=${PPID:-100} @@ -11,13 +12,13 @@ status=0 for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ - LC_ALL=$l ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LC_ALL=$l ${run_program_prefix} \ ${common_objpfx}localedata/collate-test $id < $cns.in \ > ${common_objpfx}localedata/$cns.out || status=1 cmp -s $cns.in ${common_objpfx}localedata/$cns.out || status=1 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ - LC_ALL=$l ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LC_ALL=$l ${run_program_prefix} \ ${common_objpfx}localedata/xfrm-test $id < $cns.in \ > ${common_objpfx}localedata/$cns.xout || status=1 cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || status=1 diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh index a0d51dc..5b906a2 100755 --- a/localedata/tst-ctype.sh +++ b/localedata/tst-ctype.sh @@ -19,6 +19,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx=$1; shift +tst_ctype=$1; shift status=0 # Run the test programs. @@ -30,8 +31,7 @@ for loc in de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 ja_JP.EUC-JP; do input=/dev/null fi LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ - LC_ALL=$loc ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-ctype < $input \ + LC_ALL=$loc ${tst_ctype} < $input \ >> ${common_objpfx}localedata/tst-ctype.out || status=1 done diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index 469d227..99c5cc6 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -25,7 +25,8 @@ case $1 in esac common_objpfx=$1 -datafile=$2 +run_program_prefix=$2 +datafile=$3 here=`pwd` @@ -37,19 +38,17 @@ for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do fn=charmaps/ISO-8859-1 I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \ LOCPATH=${common_objpfx}localedata LC_ALL=C LANGUAGE=C \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}locale/localedef \ + ${run_program_prefix} ${common_objpfx}locale/localedef \ --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns done # Run the tests. -IFS=" " # This is a TAB -while read locale format value expect; do +# There's a TAB for IFS +while IFS=" " read locale format value expect; do if [ -n "$format" ]; then LOCPATH=${common_objpfx}localedata \ GCONV_PATH=${common_objpfx}/iconvdata \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-fmon \ + ${run_program_prefix} ${common_objpfx}localedata/tst-fmon \ "$locale" "$format" "$value" "$expect" if [ $? -eq 0 ]; then if [ $DEBUG -eq 1 ]; then diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh index 79e5410..4d50311 100755 --- a/localedata/tst-locale.sh +++ b/localedata/tst-locale.sh @@ -20,6 +20,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx=$1; shift +localedef=$1; shift test_locale () { @@ -32,8 +33,7 @@ test_locale () fi I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \ LOCPATH=${common_objpfx}localedata LC_ALL=C LANGUAGE=C \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \ + ${localedef} --quiet -c -f $charmap -i $input \ ${rep} ${common_objpfx}localedata/$out if [ $? -ne 0 ]; then diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh index 267ab48..575ba1a 100755 --- a/localedata/tst-mbswcs.sh +++ b/localedata/tst-mbswcs.sh @@ -19,33 +19,29 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx=$1; shift +run_program_prefix=$1; shift status=0 # Run the test programs. LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-mbswcs1 \ +${run_program_prefix} ${common_objpfx}localedata/tst-mbswcs1 \ > ${common_objpfx}localedata/tst-mbswcs.out || status=1 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-mbswcs2 \ +${run_program_prefix} ${common_objpfx}localedata/tst-mbswcs2 \ >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-mbswcs3 \ +${run_program_prefix} ${common_objpfx}localedata/tst-mbswcs3 \ >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-mbswcs4 \ +${run_program_prefix} ${common_objpfx}localedata/tst-mbswcs4 \ >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-mbswcs5 \ +${run_program_prefix} ${common_objpfx}localedata/tst-mbswcs5 \ >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 exit $status diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh index dd6b8a1..d3eb593 100755 --- a/localedata/tst-rpmatch.sh +++ b/localedata/tst-rpmatch.sh @@ -20,14 +20,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx=$1 -IFS="&" +tst_rpmatch=$2 + rc=0 -while read locale string result dummy; do +while IFS=\& read locale string result dummy; do if [ "$locale" != "#" ]; then LOCPATH=${common_objpfx}localedata \ GCONV_PATH=${common_objpfx}/iconvdata \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}localedata/tst-rpmatch $locale $string $result \ + ${tst_rpmatch} $locale $string $result \ || exit 1 fi done < ${common_objpfx}localedata/tst-trans.out exit $? -- cgit v1.1