Bug#687906: coreutils t-p-u for #687906?

2013-01-26 Thread Julien Cristau
On Sat, Jan 26, 2013 at 16:26:19 +, Steve McIntyre wrote:

> Hi folks,
> 
> Slightly confused by the packages.qa.d.o page about coreutils, I
> started investigating FTBFS on powerpc. I've since seen that 8.13-3.4
> is already built and installed everywhere, but it reliably fails to
> build for me with testsuite failures similar to those reported in
> #687906, reported against 8.13-3.3. Building on my local powerpc box
> works with the attached debdiff, and I'm worried about maybe releasing
> wheezy with stuff that doesn't build. What do you think of this debdiff?
> 
Looks fine to me.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#687906: coreutils t-p-u for #687906?

2013-01-26 Thread Steve McIntyre
Hi folks,

Slightly confused by the packages.qa.d.o page about coreutils, I
started investigating FTBFS on powerpc. I've since seen that 8.13-3.4
is already built and installed everywhere, but it reliably fails to
build for me with testsuite failures similar to those reported in
#687906, reported against 8.13-3.3. Building on my local powerpc box
works with the attached debdiff, and I'm worried about maybe releasing
wheezy with stuff that doesn't build. What do you think of this debdiff?

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
Can't keep my eyes from the circling sky,
Tongue-tied & twisted, Just an earth-bound misfit, I...
diff -u coreutils-8.13/debian/changelog coreutils-8.13/debian/changelog
--- coreutils-8.13/debian/changelog
+++ coreutils-8.13/debian/changelog
@@ -1,3 +1,14 @@
+coreutils (8.13-3.5) wheezy; urgency=low
+
+  * Non-maintainer upload.
+  * Multiple test-suite fixes. Closes: #687906
++ Extend the fix for #685238: recognise if valgrind is not
+  installed and skip the test
++ Apply upstream fix in the test for parse-datetime so that it works
+  regardless of system DST status
+
+ -- Steve McIntyre <93...@debian.org>  Sat, 26 Jan 2013 12:10:17 +
+
 coreutils (8.13-3.4) wheezy; urgency=low
 
   * Non-maintainer upload.
diff -u coreutils-8.13/debian/patches/00list 
coreutils-8.13/debian/patches/00list
--- coreutils-8.13/debian/patches/00list
+++ coreutils-8.13/debian/patches/00list
@@ -8,6 +8,7 @@
 84_getcwd
 85_timer_settime
 86_float_ppc
+99_fix_parse-datetime-test.dpatch
 99_disable_tests.misc.ls-time
 99_kfbsd_build_tests
 99_kfbsd_fstat_patch
diff -u coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch 
coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
--- coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
+++ coreutils-8.13/debian/patches/99_sort_-u_data_loss.dpatch
@@ -10,18 +10,18 @@
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
coreutils-8.13~/THANKS.in coreutils-8.13/THANKS.in
 --- coreutils-8.13~/THANKS.in  2011-08-08 09:16:09.0 +0100
-+++ coreutils-8.13/THANKS.in   2012-09-10 13:25:46.0 +0100
 coreutils-8.13/THANKS.in   2013-01-26 14:13:20.0 +
 @@ -486,6 +486,7 @@
  Rainer Orth r...@techfak.uni-bielefeld.de
  Ralf W. Stephan step...@tmt.de
  Ralph Loaderloa...@maths.ox.ac.uk
 +Rasmus Borup Hansen r...@intomics.com
  Raul Miller m...@magenta.com
- Ra�l N��ez de Arenas Coronado   r...@pleyades.net
+ Raúl Núñez de Arenas Coronado   r...@pleyades.net
  Richard A Downing   richard.down...@bcs.org.uk
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
coreutils-8.13~/src/sort.c coreutils-8.13/src/sort.c
 --- coreutils-8.13~/src/sort.c 2011-07-29 09:12:25.0 +0100
-+++ coreutils-8.13/src/sort.c  2012-09-10 13:26:34.0 +0100
 coreutils-8.13/src/sort.c  2013-01-26 14:13:20.0 +
 @@ -263,6 +263,9 @@
 when popping. */
  };
@@ -58,7 +58,7 @@
  {
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
coreutils-8.13~/tests/Makefile.am coreutils-8.13/tests/Makefile.am
 --- coreutils-8.13~/tests/Makefile.am  2011-09-02 13:08:40.0 +0100
-+++ coreutils-8.13/tests/Makefile.am   2012-09-10 13:27:42.0 +0100
 coreutils-8.13/tests/Makefile.am   2013-01-26 14:13:20.0 +
 @@ -249,6 +249,7 @@
misc/sort-unique\
misc/sort-unique-segv   \
@@ -67,9 +67,25 @@
split/filter\
split/suffix-length \
split/b-chunk   \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
coreutils-8.13~/tests/init.cfg coreutils-8.13/tests/init.cfg
+--- coreutils-8.13~/tests/init.cfg 2013-01-26 14:13:14.0 +
 coreutils-8.13/tests/init.cfg  2013-01-26 14:14:12.0 +
+@@ -112,6 +112,12 @@
+ && skip_ "this shell lacks ulimit support"
+ }
+ 
++# Skip the current test if valgrind doesn't work.
++require_valgrind_()
++{
++  valgrind --help >/dev/null || skip_ "requires valgrind"
++}
++
+ require_readable_root_()
+ {
+   test -r / || skip_ "/ is not readable"
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
coreutils-8.13~/tests/misc/sort coreutils-8.13/tests/misc/sort
 --- coreutils-8.13~/tests/misc/sort2011-07-28 11:38:27.0 +0100
-+++ coreutils-8.13/t