Commit 101039e6 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Give some unit tests more time

Hack up the unit tests to wait longer for the thread test to finish.
This is not a real fix, but it will probably make it more likely that we
successfully build on our mips/octeon machines (Re: Tor#6227).
parent 41ce2d53
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ tor (0.2.3.17-beta-3) unstable; urgency=low

  * Apply the correct SE-Linux label to /var/run/tor when creating the
    directory in the init script (closes: #678362).  Thanks to Russell Coker.
  * Hack up the unit tests to wait longer for the thread test to finish.
    This is not a real fix, but it will probably make it more likely that
    we successfully build on our mips/octeon machines (Re: Tor#6227).

 -- Peter Palfrader <weasel@debian.org>  Sun, 24 Jun 2012 15:19:13 +0200
 -- Peter Palfrader <weasel@debian.org>  Sun, 24 Jun 2012 16:13:35 +0200

tor (0.2.3.17-beta-2) unstable; urgency=low

+1 −0
Original line number Diff line number Diff line
# 02_add_debian_files_in_manpage.dpatch
03_tor_manpage_in_section_8.dpatch
14_fix_geoip_warning
15_longer_test_timeout
+19 −0
Original line number Diff line number Diff line
#! /bin/sh /usr/share/dpatch/dpatch-run
## longer-test-timeout.dpatch by  <weasel@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: extend timeout for mutex test.  cf. Tor#6227

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tor~/src/test/test_util.c tor/src/test/test_util.c
--- tor~/src/test/test_util.c	2012-06-24 15:16:32.000000000 +0200
+++ tor/src/test/test_util.c	2012-06-24 16:09:56.360489077 +0200
@@ -1213,7 +1213,7 @@
     if (strmap_get(_thread_test_strmap, "thread 1") &&
         strmap_get(_thread_test_strmap, "thread 2")) {
       done = 1;
-    } else if (time(NULL) > started + 25) {
+    } else if (time(NULL) > started + 250) {
       timedout = done = 1;
     }
     tor_mutex_release(_thread_test_mutex);