diff options
author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
---|---|---|
committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
commit | bde2a94b61d1cef444d7d4b4b9db70062c48cf5d (patch) | |
tree | 5393a8c666de2fb8995df1282909c09ed17d9351 /localedata/sort-test.sh | |
parent | 3f1ff80d9a0c60398e73d62c52f9a2f06af8d61d (diff) | |
parent | 66986dec455c2011085a04b72a5bd55d9f9c7d1c (diff) | |
download | glibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.tar.gz glibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.tar.xz glibc-bde2a94b61d1cef444d7d4b4b9db70062c48cf5d.zip |
Merge branch 'release/2.19/master' into ibm/2.19/master ibm/2.19/master
Conflicts: NEWS
Diffstat (limited to 'localedata/sort-test.sh')
-rw-r--r-- | localedata/sort-test.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 8a7ca89688..b01a78ea14 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -49,11 +49,17 @@ for l in $lang; do ${common_objpfx}localedata/xfrm-test $id < $cns.in \ > ${common_objpfx}localedata/$cns.xout || here=1 cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || here=1 + LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ + LC_ALL=$l ${test_program_prefix} \ + ${common_objpfx}localedata/xfrm-test $id -nocache < $cns.in \ + > ${common_objpfx}localedata/$cns.nocache.xout || here=1 + cmp -s $cns.in ${common_objpfx}localedata/$cns.nocache.xout || here=1 if test $here -eq 0; then echo "$l xfrm-test OK" else echo "$l xfrm-test FAIL" diff -u $cns.in ${common_objpfx}localedata/$cns.xout | sed 's/^/ /' + diff -u $cns.in ${common_objpfx}localedata/$cns.nocache.xout | sed 's/^/ /' status=1 fi done |