tst-gettext2: make setup more robust

This test should be more robust about setting up its lang dirs.
I had two completely different systems (ia64 & x86_64) get wedged
in a way where the test just kept FAILing on me due to some of the
files missing.  This probably wasn't a big deal until the recent
commit which made checking of the locale dirs more robust (for
security reasons).
This commit is contained in:
Mike Frysinger 2014-08-04 10:31:27 -04:00
parent 656b84c2ef
commit f469c49f92
2 changed files with 14 additions and 14 deletions

View File

@ -1,3 +1,7 @@
2014-08-08 Mike Frysinger <vapier@gentoo.org>
* intl/tst-gettext2.sh: Check every lang file for creation.
2014-08-07 Wilco Dijkstra <wdijkstr@arm.com> 2014-08-07 Wilco Dijkstra <wdijkstr@arm.com>
* sysdeps/aarch64/fpu/math_private.h * sysdeps/aarch64/fpu/math_private.h

View File

@ -28,27 +28,23 @@ objpfx=$5
# Generate the test data. # Generate the test data.
mkdir -p ${objpfx}domaindir mkdir -p ${objpfx}domaindir
# Create the locale directories. # Create the locale directories.
test -d ${objpfx}domaindir/lang1 || { mkdir -p \
mkdir ${objpfx}domaindir/lang1 ${objpfx}domaindir/lang1/LC_MESSAGES \
for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do ${objpfx}domaindir/lang2/LC_MESSAGES
for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
[ -e ${objpfx}domaindir/lang1/LC_$f ] ||
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \ cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
${objpfx}domaindir/lang1 ${objpfx}domaindir/lang1
done [ -e ${objpfx}domaindir/lang2/LC_$f ] ||
}
test -d ${objpfx}domaindir/lang2 || {
mkdir ${objpfx}domaindir/lang2
for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \ cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
${objpfx}domaindir/lang2 ${objpfx}domaindir/lang2
done done
} test -e ${objpfx}domaindir/lang1/LC_MESSAGES/SYS_LC_MESSAGES || {
test -d ${objpfx}domaindir/lang1/LC_MESSAGES || {
mkdir ${objpfx}domaindir/lang1/LC_MESSAGES
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \ cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${objpfx}domaindir/lang1/LC_MESSAGES ${objpfx}domaindir/lang1/LC_MESSAGES
} }
test -d ${objpfx}domaindir/lang2/LC_MESSAGES || { test -e ${objpfx}domaindir/lang2/LC_MESSAGES/SYS_LC_MESSAGES || {
mkdir ${objpfx}domaindir/lang2/LC_MESSAGES
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \ cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${objpfx}domaindir/lang2/LC_MESSAGES ${objpfx}domaindir/lang2/LC_MESSAGES
} }