[PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower machines

[PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower machines

[Mark H Weaver]

[-- Attachment #1: Type: text/plain, Size: 53 bytes --]

This is needed on Loongson 2F machines.

      Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower machines --]
[-- Type: text/x-patch, Size: 2800 bytes --]

From a3f19db3e9f0dd810f23c06f4d9e63d815e29c21 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 26 Mar 2014 23:33:26 -0400
Subject: [PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower
 machines.

* gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch:
  New file.
* gnu/packages/pulseaudio.scm (pulseaudio): Add it.
* gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                                |  1 +
 .../patches/pulseaudio-increase-thread-test-timeout.patch    | 12 ++++++++++++
 gnu/packages/pulseaudio.scm                                  |  5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch

diff --git a/gnu-system.am b/gnu-system.am
index 197265c..b512a5c 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -311,6 +311,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/perl-no-sys-dirs.patch			\
   gnu/packages/patches/plotutils-libpng-jmpbuf.patch		\
   gnu/packages/patches/procps-make-3.82.patch			\
+  gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch \
   gnu/packages/patches/python-fix-dbm.patch			\
   gnu/packages/patches/qemu-make-4.0.patch			\
   gnu/packages/patches/qemu-multiple-smb-shares.patch		\
diff --git a/gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch b/gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch
new file mode 100644
index 0000000..a10a9d8
--- /dev/null
+++ b/gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch
@@ -0,0 +1,12 @@
+Needed for slower machines.
+
+--- pulseaudio/src/tests/thread-test.c.orig	2014-01-23 13:57:55.000000000 -0500
++++ pulseaudio/src/tests/thread-test.c	2014-03-26 23:28:50.046386718 -0400
+@@ -152,6 +152,7 @@
+     s = suite_create("Thread");
+     tc = tcase_create("thread");
+     tcase_add_test(tc, thread_test);
++    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index db7e752..de95c8a 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -142,7 +142,10 @@ parse JSON formatted strings back into the C representation of JSON objects.")
                    version ".tar.xz"))
              (sha256
               (base32
-               "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr"))))
+               "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr"))
+             (patches
+              (list (search-patch
+                     "pulseaudio-increase-thread-test-timeout.patch")))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc"
-- 
1.8.4

Re: [PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower machines

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> From a3f19db3e9f0dd810f23c06f4d9e63d815e29c21 Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Wed, 26 Mar 2014 23:33:26 -0400
> Subject: [PATCH] gnu: pulseaudio: Increase thread-test timeout, for slower
>  machines.
>
> * gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch:
>   New file.
> * gnu/packages/pulseaudio.scm (pulseaudio): Add it.
> * gnu-system.am (dist_patch_DATA): Add it.

[...]

> +++ b/gnu/packages/patches/pulseaudio-increase-thread-test-timeout.patch
> @@ -0,0 +1,12 @@
> +Needed for slower machines.

Perhaps add “Increase test timeout from XXX to 120 seconds” since it’s
not obvious.

OK to commit with this change!

Also please report it to
<https://bugs.freedesktop.org/buglist.cgi?product=PulseAudio&component=core&resolution=--->
as time permits.  They have been receptive to similar issues in the
past.

Thanks!

Ludo’.

[PATCH] gnu: pulseaudio: Increase timeouts for tests

[Mark H Weaver]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

Hi Ludovic,

As per your suggestion, this new version of the patch simply sets the
CK_DEFAULT_TIMEOUT variable to 120.  I've tested it on my YeeLoong, and
it works.

     Mark



[-- Attachment #2: [PATCH] gnu: pulseaudio: Increase timeouts for tests --]
[-- Type: text/x-patch, Size: 1641 bytes --]

From 727c3ed2fba074f3fad38d352d0484d69cc9993b Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 1 Apr 2014 13:53:37 -0400
Subject: [PATCH] gnu: pulseaudio: Increase timeouts for tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/pulseaudio.scm: Set the 'CK_DEFAULT_TIMEOUT' environment
  variable to 120 in the 'pre-check' phase.  Suggested by Ludovic Courtès.
---
 gnu/packages/pulseaudio.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index db7e752..ca8c79b 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -152,7 +153,10 @@ parse JSON formatted strings back into the C representation of JSON objects.")
                  (lambda _
                    ;; 'tests/lock-autospawn-test.c' wants to create a file
                    ;; under ~/.config/pulse.
-                   (setenv "HOME" (getcwd)))
+                   (setenv "HOME" (getcwd))
+                   ;; 'thread-test' needs more time on hydra and on slower
+                   ;; machines, so we set the default timeout to 120 seconds.
+                   (setenv "CK_DEFAULT_TIMEOUT" "120"))
                  %standard-phases)))
     (inputs
      ;; TODO: Add optional inputs (GTK+?).
-- 
1.8.4

Re: [PATCH] gnu: pulseaudio: Increase timeouts for tests

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> As per your suggestion, this new version of the patch simply sets the
> CK_DEFAULT_TIMEOUT variable to 120.  I've tested it on my YeeLoong, and
> it works.

Cool, please push!

Ludo’.