From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKxWO-00077M-NQ for guix-patches@gnu.org; Mon, 29 Apr 2019 00:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKxWN-0001ax-GJ for guix-patches@gnu.org; Mon, 29 Apr 2019 00:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKxWN-0001ar-DU for guix-patches@gnu.org; Mon, 29 Apr 2019 00:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKxWM-0003Nr-QX for guix-patches@gnu.org; Mon, 29 Apr 2019 00:04:02 -0400 Subject: [bug#35483] [PATCH] gnu: u-boot-tools: Only run full test suite on x86. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:60690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKxW7-0006vh-Hs for guix-patches@gnu.org; Mon, 29 Apr 2019 00:03:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKxOQ-0006a0-Fh for guix-patches@gnu.org; Sun, 28 Apr 2019 23:55:51 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKxOQ-0006Z2-A9 for guix-patches@gnu.org; Sun, 28 Apr 2019 23:55:50 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 2458B1AA54 for ; Sun, 28 Apr 2019 20:55:46 -0700 (PDT) From: Vagrant Cascadian Date: Sun, 28 Apr 2019 20:55:39 -0700 Message-ID: <87ef5lbh38.fsf@ponder> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: 35483@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/bootloaders (u-boot-tools)[check]: Remove x86 tests. [check-x86]: New phase with x86 tests. [patch]: Patch test-imagetools.sh to test binaries to be installed. =2D-- gnu/packages/bootloaders.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b4eabaea48..0cd72fb44c 100644 =2D-- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -442,6 +442,10 @@ also initializes the boards (RAM etc).") (("def test_ctrl_c") "@pytest.mark.skip(reason=3D'Guix has problems with SIGINT') def test_ctrl_c")) + ;; Test against the tools being installed rather than tools b= uilt + ;; for "sandbox" target. + (substitute* "test/image/test-imagetools.sh" + (("BASEDIR=3Dsandbox") "BASEDIR=3D.")) (for-each (lambda (file) (substitute* file ;; Disable signatures, due to GPL/Openssl @@ -484,12 +488,19 @@ def test_ctrl_c")) (delete 'check) (add-after 'install 'check (lambda* (#:key make-flags test-target #:allow-other-keys) =2D (apply invoke "make" "mrproper" make-flags) =2D (setenv "SDL_VIDEODRIVER" "dummy") =2D (setenv "PAGER" "cat") =2D (apply invoke "make" test-target make-flags) =2D (symlink "build-sandbox_spl" "sandbox") =2D (invoke "test/image/test-imagetools.sh")))))) + (invoke "test/image/test-imagetools.sh"))) + ;; Only run full test suite on x86 systems, as many tests assume + ;; x86. + ,@(if (string-match "^(x86_64|i686)-linux" + (or (%current-target-system) + (%current-system))) + '((add-after 'check 'check-x86 + (lambda* (#:key make-flags test-target #:allow-other-= keys) + (apply invoke "make" "mrproper" make-flags) + (setenv "SDL_VIDEODRIVER" "dummy") + (setenv "PAGER" "cat") + (apply invoke "make" test-target make-flags)))) + '())))) (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc). This package provides its board-independent tools."))) =2D-=20 2.20.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXMZ1vAAKCRDcUY/If5cW qlmPAQDBv5y0ZYfGgMj0LIh+ZlAnhnxEDakVWpCiEHdba0ILDAD9FnZFX3SwpPWW VftsjbyYG99e1fWv3E+pnPdkcpj77AU= =mKQm -----END PGP SIGNATURE----- --=-=-=--