From patchwork Mon Aug 4 14:33:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 2297 Received: (qmail 17281 invoked by alias); 4 Aug 2014 14:33:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 17270 invoked by uid 89); 4 Aug 2014 14:33:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH] tst-gettext2: make setup more robust Date: Mon, 4 Aug 2014 10:33:50 -0400 Message-Id: <1407162830-7944-1-git-send-email-vapier@gentoo.org> 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(-) diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh index b4d203d..3bac6c9 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 }