From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2Jc7-0000V1-RE for guix-patches@gnu.org; Wed, 11 Oct 2017 12:12:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2Jc1-0006Zw-Vj for guix-patches@gnu.org; Wed, 11 Oct 2017 12:12:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2Jc1-0006Zn-RA for guix-patches@gnu.org; Wed, 11 Oct 2017 12:12:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e2Jc1-00072C-Lr for guix-patches@gnu.org; Wed, 11 Oct 2017 12:12:01 -0400 Subject: [bug#28616] disable failing bluez test Resent-Message-ID: Date: Wed, 11 Oct 2017 18:10:58 +0200 (CEST) Message-Id: <20171011.181058.1825950437807455612.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <877ew28yw8.fsf@fastmail.com> References: <874lrfew8v.fsf@fastmail.com> <20171004.200454.31853833354551300.post@thomasdanckaert.be> <877ew28yw8.fsf@fastmail.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Oct_11_18_10_58_2017_044)--" Content-Transfer-Encoding: 7bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: mbakke@fastmail.com Cc: 28616@debbugs.gnu.org ----Next_Part(Wed_Oct_11_18_10_58_2017_044)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Marius Bakke Subject: Re: [bug#28616] disable failing bluez test Date: Tue, 10 Oct 2017 23:40:39 +0200 > Thomas Danckaert writes: > >> From: Marius Bakke >> Subject: Re: [bug#28616] disable failing bluez test >> Date: Tue, 03 Oct 2017 23:50:56 +0200 >> >>> I think we should apply the patch regardless (on 'core-updates'), with a >>> link to the upstream discussion. IMO it's more important to be able to >>> build from source regardless of hardware, than running this one unit >>> test. What do you think? >> >> I agree. >> >> I'll push this to core-updates then. > > On second thought, "bluez" is currently failing on armhf, seemingly due > to the original patch: I believe attached patch does the job for master, just touching armhf and leaving other architectures alone. I tested it by replacing armhf-linux with x86_64-linux, and then it skips the test ... WDYT? Thomas ----Next_Part(Wed_Oct_11_18_10_58_2017_044)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-WIP-fix-bluez.patch" >From 89eb8efeb650d53085fa36f42b5615f6cf4717b6 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Wed, 11 Oct 2017 18:05:24 +0200 Subject: [PATCH] WIP fix bluez. --- gnu/packages/linux.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ef7a105d..34230cd15 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3049,6 +3049,16 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append "--with-udevdir=" out "/lib/udev"))) #:phases (modify-phases %standard-phases + ,@(if (string=? (%current-system) "armhf-linux") + ;; This test fails unpredictably. + ;; TODO: skip it for all architectures. + `((add-before 'check 'skip-wonky-test + (lambda _ + (substitute* "unit/test-gatt.c" + (("tester_init\\(&argc, &argv\\);") "return 77;")) + #t))) + `()) + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3067,12 +3077,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (string-append out "/lib/udev/hid2hci --method")) (("/sbin/udevadm") (string-append (assoc-ref inputs "eudev") "/bin/udevadm"))) - #t)))) - - ;; FIXME: Skip one test that segfaults on ARM. - ,@(if (string=? (%current-system) "armhf-linux") - '(#:make-flags '("XFAIL_TESTS=unit/test-gatt")) - '()))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal))) -- 2.14.2 ----Next_Part(Wed_Oct_11_18_10_58_2017_044)----