bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/2] build: update gnulib submodule to latest


From: Jim Meyering
Subject: [PATCH 1/2] build: update gnulib submodule to latest
Date: Sat, 17 Oct 2009 12:23:30 +0200

This updates to the latest gnulib and fixes a minor
test failure on powerpc Mac OS X.

>From f8653f2af3fa96621596881d909021c843abd2fa Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 15 Oct 2009 22:13:10 +0200
Subject: [PATCH 1/2] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 959d9cb..791cc50 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 959d9cb463d992f9c5cc2fbeb54bf12eee2346f7
+Subproject commit 791cc509ac459a2555f8d633ad67455cf8d3fe4d
--
1.6.5.259.ge555b


>From 527fb951def33fd76302e06f30e7221abd516ab6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 17 Oct 2009 12:18:54 +0200
Subject: [PATCH 2/2] tests: abmon-align: avoid test failure

* tests/ls/abmon-align: Don't remove (1d;) the first line of output.
That was making the test consider only 11 of 12 month names.
Rewrite not to use \(.*\), as that provoked a malfunction in GNU sed
on powerpc Mac OS X (though we don't know yet whether this is due to a
sed bug, or to miscompilation).  Nelson Beebe reported the test failure.
---
 tests/ls/abmon-align |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tests/ls/abmon-align b/tests/ls/abmon-align
index 73b51e8..47df97a 100755
--- a/tests/ls/abmon-align
+++ b/tests/ls/abmon-align
@@ -34,9 +34,12 @@ fail=0

 for format in "%b" "[%b" "%b]" "[%b]"; do
   for LOC in C gv_GB ga_IE fi_FI.utf8 zh_CN ar_SY $LOCALE_FR_UTF8; do
+    # The sed usage here is slightly different from the original,
+    # removing the \(.*\), to avoid triggering misbehavior in at least
+    # GNU sed 4.2 (possibly miscompiled) on Mac OS X (Darwin 9.8.0).
     n_widths=$(
       LC_ALL=$LOC TIME_STYLE=+"$format" ls -lgG *.ts |
-      LC_ALL=C sed '1d; s/.\{15\}\(.*\) ...ts$/\1/; s/ /./g' |
+      LC_ALL=C sed 's/.\{15\}//;s/ ..\.ts$//;s/ /./g' |
       while read mon; do echo "$mon" | LC_ALL=$LOC wc -L; done |
       uniq | wc -l
     )
--
1.6.5.259.ge555b




reply via email to

[Prev in Thread] Current Thread [Next in Thread]