From patchwork Mon Apr 29 03:55:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 13812 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9798616F57; Mon, 29 Apr 2019 05:04:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1FC3716F52 for ; Mon, 29 Apr 2019 05:04:13 +0100 (BST) Received: from localhost ([127.0.0.1]:51631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKxWW-0007De-Dy for patchwork@mira.cbaines.net; Mon, 29 Apr 2019 00:04:12 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35483] [PATCH] gnu: u-boot-tools: Only run full test suite on x86. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2019 04:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35483@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155651063812995 (code B ref -1); Mon, 29 Apr 2019 04:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2019 04:03:58 +0000 Received: from localhost ([127.0.0.1]:38192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKxWH-0003NW-S6 for submit@debbugs.gnu.org; Mon, 29 Apr 2019 00:03:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKxWD-0003NF-KJ for submit@debbugs.gnu.org; Mon, 29 Apr 2019 00:03:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:45179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKxW8-0001Lr-HS for submit@debbugs.gnu.org; Mon, 29 Apr 2019 00:03:48 -0400 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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='Guix has problems with SIGINT') def test_ctrl_c")) + ;; Test against the tools being installed rather than tools built + ;; for "sandbox" target. + (substitute* "test/image/test-imagetools.sh" + (("BASEDIR=sandbox") "BASEDIR=.")) (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) - (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 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.")))