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/tst-fmon.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'localedata/tst-fmon.sh') diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index 469d227afb..99c5cc6801 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 -- cgit v1.2.3