[apr] 02/02: debug output for strange test failure

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr.

commit 97f3ac75c6469842a829ac6228581ba741a53875
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Aug 20 09:14:26 2015 +0200

    debug output for strange test failure
---
 debian/changelog                            |  6 ++++++
 debian/patches/debug_testpoll_failure.patch | 16 ++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eedb12a..2bb3cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr (1.5.2-3) UNRELEASED; urgency=medium
+
+  * Add debug output for strange test failure on reproducible.debian.net.
+
+ -- Stefan Fritsch <sf at debian.org>  Thu, 20 Aug 2015 09:13:40 +0200
+
 apr (1.5.2-2) unstable; urgency=medium
 
   * Remove the buildhost's hostname from libtool for reproducible builds.
diff --git a/debian/patches/debug_testpoll_failure.patch b/debian/patches/debug_testpoll_failure.patch
new file mode 100644
index 0000000..bb3df36
--- /dev/null
+++ b/debian/patches/debug_testpoll_failure.patch
@@ -0,0 +1,16 @@
+# reproducible.debian.net gave strange test error on build:
+#   testpoll            :  Line 876: apr_pollcb_poll() didn't sleep
+#   FAILED 1 of 23
+# add some debug output
+--- apr.orig/test/testpoll.c
++++ apr/test/testpoll.c
+@@ -871,6 +871,9 @@ static void justsleep(abts_case *tc, voi
+             rv = apr_pollcb_poll(pollcb, apr_time_from_msec(200), NULL, NULL);
+             t2 = apr_time_now();
+             ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
++            if ((t2 - t1) <= apr_time_from_msec(100))
++                abts_log_message("pollset method: %d t1: %ld t2: %ld rv: %d\n",
++                                 i, (long)t1, (long)t2, rv);
+             ABTS_ASSERT(tc,
+                         "apr_pollcb_poll() didn't sleep",
+                         (t2 - t1) > apr_time_from_msec(100));
diff --git a/debian/patches/series b/debian/patches/series
index 9c6a281..79c1c15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ hurd_shm_flock.patch
 dont_override_external_buildflags
 libtoolize_check.patch
 apr_mcast_v6.patch
+debug_testpoll_failure.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git