diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/sort-test.sh | 22 | ||||
| -rwxr-xr-x | localedata/tst-fmon.sh | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 8f9bb55b72..affbb26312 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -11,7 +11,7 @@ for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` cn=locales/$cns fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'` - LD_LIBRARY_PATH=$common_objpfx I18NPATH=./locales ${common_objpfx}elf/ld.so \ + I18NPATH=./locales ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \ ${common_objpfx}localedata/$cns done @@ -20,17 +20,17 @@ done status=0 for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` - LOCPATH=$common_objpfx/localedata LC_ALL=$cns \ - LD_LIBRARY_PATH=$common_objpfx $common_objpfx/elf/ld.so \ - $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 LC_ALL=$cns \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + ${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 LC_ALL=$cns \ - LD_LIBRARY_PATH=$common_objpfx $common_objpfx/elf/ld.so \ - $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 + LOCPATH=${common_objpfx}localedata LC_ALL=$cns \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + ${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 done exit $status diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh index aadc40cbf6..4192a405d6 100755 --- a/localedata/tst-fmon.sh +++ b/localedata/tst-fmon.sh @@ -32,19 +32,19 @@ for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` cn=locales/$cns fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'` - LD_LIBRARY_PATH=$common_objpfx I18NPATH=./locales \ - ${common_objpfx}elf/ld.so ${common_objpfx}locale/localedef \ + I18NPATH=./locales \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + ${common_objpfx}locale/localedef \ --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns done # Run the tests. IFS=" " # This is a TAB -cat $datafile | while read locale format value expect; do if [ -n "$format" ]; then LOCPATH=${common_objpfx}localedata \ - LD_LIBRARY_PATH=$common_objpfx \ - ${common_objpfx}elf/ld.so ${common_objpfx}localedata/tst-fmon \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + ${common_objpfx}localedata/tst-fmon \ "$locale" "$format" "$value" "$expect" if [ $? -eq 0 ]; then if [ $DEBUG -eq 1 ]; then @@ -57,7 +57,7 @@ while read locale format value expect; do exit 1 fi fi -done +done < $datafile exit $? # Local Variables: |