summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-08-04 10:31:27 -0400
committerMike Frysinger <vapier@gentoo.org>2014-08-08 22:55:48 -0400
commitf469c49f921d1809eed5e483606e8a859318b8c6 (patch)
tree022070bdd118ef4ae2ca5e68d03b545678c23a4e
parent656b84c2ef525e3b69802c9057c5897e327b0332 (diff)
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).
-rw-r--r--ChangeLog4
-rw-r--r--intl/tst-gettext2.sh24
2 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 1702300704..af9cf96a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* sysdeps/aarch64/fpu/math_private.h
diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh
index b4d203d667..3bac6c9957 100644
--- a/intl/tst-gettext2.sh
+++ b/intl/tst-gettext2.sh
@@ -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
}