From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLFlg-0007hy-5k for guix-patches@gnu.org; Mon, 29 Apr 2019 19:33:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLFlf-0001ud-7Z for guix-patches@gnu.org; Mon, 29 Apr 2019 19:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLFlf-0001uX-4X for guix-patches@gnu.org; Mon, 29 Apr 2019 19:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hLFle-0005Sr-Go for guix-patches@gnu.org; Mon, 29 Apr 2019 19:33:03 -0400 Subject: [bug#35483] gnu: u-boot-tools: Only run full test suite on x86. Resent-Message-ID: From: Vagrant Cascadian In-Reply-To: <87ef5lbh38.fsf@ponder> References: <87ef5lbh38.fsf@ponder> Date: Mon, 29 Apr 2019 16:32:40 -0700 Message-ID: <87pnp4wfon.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 I neglected to mention in my initial submission that the test suite has failed on non-x86 architectures since I started testing u-boot on Guix a year or so ago... It blocks working support for veyron-speedy/Asus C201, and that would be very nice to have fixed for 1.0, of course! I may need to update the patch to exclude i686-linux from the full test suite, as it seems with u-boot 2019.04 to also fail with 32-bit x86 making some 64-bit assumptions... Thanks for the review, if you can! live well, vagrant On 2019-04-28, Vagrant Cascadian wrote: > * 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. > --- > 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 > --- 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 SIGIN= T') > def test_ctrl_c")) > + ;; Test against the tools being installed rather than tools= built > + ;; for "sandbox" target. > + (substitute* "test/image/test-imagetools.sh" > + (("BASEDIR=3Dsandbox") "BASEDIR=3D.")) > (for-each (lambda (file) > (substitute* file > ;; Disable signatures, due to GPL/Open= ssl > @@ -484,12 +488,19 @@ def test_ctrl_c")) > (delete 'check) > (add-after 'install 'check > (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) > - (symlink "build-sandbox_spl" "sandbox") > - (invoke "test/image/test-imagetools.sh")))))) > + (invoke "test/image/test-imagetools.sh"))) > + ;; Only run full test suite on x86 systems, as many tests ass= ume > + ;; 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-othe= r-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."))) > --=20 > 2.20.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXMeJmAAKCRDcUY/If5cW qs4FAQCKXNiv9TLg2rclBDH1uyiuDNPcR3z7/ZgOOSQG6HO6pwD+Opfnfin+bJV/ wVR6f1yOYff//8PVGLTDgHHbRpd5MQY= =myC2 -----END PGP SIGNATURE----- --=-=-=--