diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-31 14:13:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-01 03:33:46 -0400 |
| commit | f6e7e20b03daba53cc63edd0661b2f4ead722f26 (patch) | |
| tree | db7877ac560a92861b7e0d9abb313b8123542d9f | |
| parent | 15aa2c38429a5785ed08519c88ff89a0b7027f0f (diff) | |
| download | guix-f6e7e20b03daba53cc63edd0661b2f4ead722f26.tar guix-f6e7e20b03daba53cc63edd0661b2f4ead722f26.tar.gz | |
gnu: pulseaudio: Increase timeout on cpu-mix-test.
* gnu/packages/patches/pulseaudio-longer-test-timeout.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/pulseaudio.scm (pulseaudio)[source]: Add patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/pulseaudio-longer-test-timeout.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index d3e4dafc4e..cb68e72bc3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -504,6 +504,7 @@ dist_patch_DATA = \ gnu/packages/patches/portaudio-audacity-compat.patch \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ + gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ diff --git a/gnu/packages/patches/pulseaudio-longer-test-timeout.patch b/gnu/packages/patches/pulseaudio-longer-test-timeout.patch new file mode 100644 index 0000000000..fa81f749d2 --- /dev/null +++ b/gnu/packages/patches/pulseaudio-longer-test-timeout.patch @@ -0,0 +1,13 @@ +Increase the timeout on 'cpu-mix-test' to accommodate slower machines. + +--- pulseaudio-6.0/src/tests/cpu-mix-test.c.ORIG 2015-02-12 09:10:35.000000000 -0500 ++++ pulseaudio-6.0/src/tests/cpu-mix-test.c 2015-03-31 13:45:05.316878322 -0400 +@@ -212,7 +212,7 @@ + #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON) + tcase_add_test(tc, mix_neon_test); + #endif +- tcase_set_timeout(tc, 120); ++ tcase_set_timeout(tc, 240); + suite_add_tcase(s, tc); + + sr = srunner_create(s); diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index d76f74b775..edf01e59fa 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,7 +128,9 @@ rates. ") '(substitute* "src/daemon/default.pa.in" (("load-module module-console-kit" all) (string-append "#" all "\n")))) - (patches (list (search-patch "pulseaudio-fix-mult-test.patch"))))) + (patches + (list (search-patch "pulseaudio-fix-mult-test.patch") + (search-patch "pulseaudio-longer-test-timeout.patch"))))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc" |