tst-gettext2: make setup more robust
Commit Message
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).
---
intl/tst-gettext2.sh | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
Comments
That would look OK if it had a ChangeLog entry.
On Wed 06 Aug 2014 14:20:02 Roland McGrath wrote:
> That would look OK if it had a ChangeLog entry.
i had one but forgot to commit amend before sending:
2014-08-04 Mike Frysinger <vapier@gentoo.org>
* intl/tst-gettext2.sh: Check every lang file for creation.
-mike
@@ -28,27 +28,23 @@ objpfx=$5
# Generate the test data.
mkdir -p ${objpfx}domaindir
# Create the locale directories.
-test -d ${objpfx}domaindir/lang1 || {
- mkdir ${objpfx}domaindir/lang1
- for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
+mkdir -p \
+ ${objpfx}domaindir/lang1/LC_MESSAGES \
+ ${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 \
${objpfx}domaindir/lang1
- done
-}
-test -d ${objpfx}domaindir/lang2 || {
- mkdir ${objpfx}domaindir/lang2
- for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
+ [ -e ${objpfx}domaindir/lang2/LC_$f ] ||
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
${objpfx}domaindir/lang2
- done
-}
-test -d ${objpfx}domaindir/lang1/LC_MESSAGES || {
- mkdir ${objpfx}domaindir/lang1/LC_MESSAGES
+done
+test -e ${objpfx}domaindir/lang1/LC_MESSAGES/SYS_LC_MESSAGES || {
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${objpfx}domaindir/lang1/LC_MESSAGES
}
-test -d ${objpfx}domaindir/lang2/LC_MESSAGES || {
- mkdir ${objpfx}domaindir/lang2/LC_MESSAGES
+test -e ${objpfx}domaindir/lang2/LC_MESSAGES/SYS_LC_MESSAGES || {
cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
${objpfx}domaindir/lang2/LC_MESSAGES
}