r6074 - in glibc-package/branches/eglibc-2.19/debian: . testsuite-checking
Author: aurel32
Date: 2014-05-18 22:07:59 +0000 (Sun, 18 May 2014)
New Revision: 6074
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390-linux-gnu-s390
glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390x-linux-gnu-libc
Log:
Merge from trunk
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-18 22:06:42 UTC (rev 6073)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-05-18 22:07:59 UTC (rev 6074)
@@ -91,6 +91,14 @@
-- Adam Conrad <adconrad@0c3.net> Sun, 09 Feb 2014 09:46:13 -0700
+eglibc (2.18-7) UNRELEASED; urgency=medium
+
+ [ Aurelien Jarno ]
+ * testsuite-checking/expected-results-*s390*: ignore tst-cancel17.out
+ failure, it is due to a bug in the test (see BZ #12683).
+
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 14 May 2014 20:16:16 +0200
+
eglibc (2.18-6) unstable; urgency=medium
[ Samuel Thibault ]
Modified: glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390-linux-gnu-s390
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390-linux-gnu-s390 2014-05-18 22:06:42 UTC (rev 6073)
+++ glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390-linux-gnu-s390 2014-05-18 22:07:59 UTC (rev 6074)
@@ -6,6 +6,7 @@
annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
run-conformtest.out, Error 1 (ignored)
+tst-cancel17.out, Error 1
tst-cpuclock2.out, Error 1
tst-cputimer1.out, Error 1
tst-timer.out, Error 139
Modified: glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390x-linux-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390x-linux-gnu-libc 2014-05-18 22:06:42 UTC (rev 6073)
+++ glibc-package/branches/eglibc-2.19/debian/testsuite-checking/expected-results-s390x-linux-gnu-libc 2014-05-18 22:07:59 UTC (rev 6074)
@@ -6,6 +6,7 @@
annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
run-conformtest.out, Error 1 (ignored)
+tst-cancel17.out, Error 1
tst-cpuclock2.out, Error 1
tst-cputimer1.out, Error 1
tst-timer.out, Error 139
Reply to: