From patchwork Wed Aug 21 08:54:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15064 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 7C60D17264; Wed, 21 Aug 2019 09:57:27 +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,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable 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 30E0F1724B for ; Wed, 21 Aug 2019 09:57:27 +0100 (BST) Received: from localhost ([::1]:45608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQo-0008S0-73 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPj-0006rY-37 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPh-0005Mg-KX for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPh-0005MQ-H4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPh-0006ao-Es for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 25/61] gnu: libarchive: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156637775525051 (code B ref 36477); Wed, 21 Aug 2019 08:56:17 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:55 +0000 Received: from localhost ([127.0.0.1]:34638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPK-0006Vl-U1 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:55 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:37437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOt-0006Ph-89 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: by mail-wr1-f47.google.com with SMTP id z11so1243177wrt.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FDshpS0AGzzPYlh+byrPPr0rsDhFuT/t6QZf7DVLjvw=; b=ejxn7g1yHWUfYyKfSkzdD1cIgiSgqmwH7wUgoAztSzdscAtdB3u4Q/3OcrJJiUg18k o/FRS2b+VB9I6xiUchzgoSUT88Mmdrpo+WuTbC5nadhlTpqfWBXojHM3bXGxXzVLL/Jj ltAcqg0G4yiS/ZVYuYbfJ7VgWYD/wYysjM0RD7TkP8Lpc/Z2JtzeFlmOHqmrW3O9tbaq zH/pMtS11c+DtBCSnLIjqty+H7c4R7psBb2i2hAPo3w58ivHHxIdjoaI4ex6d0TRqBfR bE8uzjyKoeUyOlPDx66hTPUzBB6CQPamQYpEI+HqcOaBYMYPsj5ns+iU9EtDYFaVZHu4 38MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FDshpS0AGzzPYlh+byrPPr0rsDhFuT/t6QZf7DVLjvw=; b=T06IgWVj8bmUGwDfvneXs8gsXBbQfwO1/Hc4VzjvclhGZ4R26sRUrOFG62o3KewaCH CI/rQFtqyfc4qVN4BITM7QY0tD+s/xo9e1XKGvWbkMQrEGgNWs5tScEQH8DYjAZxYZTo iEJv1DGbj2MO/PiC0RF9k2p3YPyOMFBhRbxLr31tKIDU2klmYxLJd4wGqLJ8eogDesRw YySheZIxkCelmtOPjp6NkTPGo0WN6eO3uB0nde0HyepAp3BCRrWr7OzIrrcEHYpljaEd wSwYsnahusTtxyj3jtJPsfeJdwhW2LRuM1hIXQXhCJCNyhRHcH28EwJKP2T7K//f1JCG NiEw== X-Gm-Message-State: APjAAAVgEoAXSKHxYQ5CJWNAq6lg3ntofyajDF5/X1kW8zovbYOO7r1A Al8+BdIleIu34s4bXMoC8zYsXpzYiIE= X-Google-Smtp-Source: APXvYqwZ5ZAiwZoieIY7UUz3DpeLJPLIYZ7qiQQYFMKBe5JwEMmMr712EKL0RN2/rymVtZaAY5BtKg== X-Received: by 2002:a5d:4f81:: with SMTP id d1mr39736889wru.177.1566377721350; Wed, 21 Aug 2019 01:55:21 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:20 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:19 +0200 Message-Id: <20190821085455.18508-25-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> MIME-Version: 1.0 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: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (libarchive)[arguments]: Do not build and run tests when cross-compiling. --- gnu/packages/backup.scm | 47 +++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a92c8c9aca..512882c17c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,24 +231,34 @@ backups (called chunks) to allow easy burning to CD/DVD.") (("/bin/pwd") (which "pwd"))) #t)) (replace 'check - (lambda _ - ;; XXX: The test_owner_parse, test_read_disk, and - ;; test_write_disk_lookup tests expect user 'root' to exist, but - ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. - ;; - ;; XXX: Adjust test that fails with zstd 1.4.1 because the default - ;; options compresses two bytes better than this test expects. - ;; https://github.com/libarchive/libarchive/issues/1226 - (substitute* "libarchive/test/test_write_filter_zstd.c" - (("compression-level\", \"6\"") - "compression-level\", \"7\"")) - - ;; The tests allow one to disable tests matching a globbing pattern. - (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") - ;; XXX: This glob disables too much. - (invoke "./libarchive_test" "^test_*_disk*") - (invoke "./bsdcpio_test" "^test_owner_parse") - (invoke "./bsdtar_test"))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + ;; XXX: The test_owner_parse, test_read_disk, and + ;; test_write_disk_lookup tests expect user 'root' to + ;; exist, but the chroot's /etc/passwd doesn't have + ;; it. Turn off those tests. + ;; + ;; XXX: Adjust test that fails with zstd 1.4.1 + ;; because the default options compresses two bytes + ;; better than this test expects. + ;; https://github.com/libarchive/libarchive/issues/1226 + (begin + (substitute* "libarchive/test/test_write_filter_zstd.c" + (("compression-level\", \"6\"") + "compression-level\", \"7\"")) + + ;; The tests allow one to disable tests matching a globbing pattern. + (invoke "make" + "libarchive_test" + "bsdcpio_test" + "bsdtar_test") + + ;; XXX: This glob disables too much. + (invoke "./libarchive_test" "^test_*_disk*") + (invoke "./bsdcpio_test" "^test_owner_parse") + (invoke "./bsdtar_test")) + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%")))) (add-after 'install 'add--L-in-libarchive-pc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))