From patchwork Tue May 28 15:40:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 14116 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 5BED617052; Tue, 28 May 2019 16:43:18 +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,T_DKIM_INVALID, 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 EC5F517050 for ; Tue, 28 May 2019 16:43:17 +0100 (BST) Received: from localhost ([127.0.0.1]:36908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeFw-0006VC-Vl for patchwork@mira.cbaines.net; Tue, 28 May 2019 11:43:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeFu-0006V7-Nq for guix-patches@gnu.org; Tue, 28 May 2019 11:43:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVeFo-0000pM-Vz for guix-patches@gnu.org; Tue, 28 May 2019 11:43:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVeFi-0000WG-Ek for guix-patches@gnu.org; Tue, 28 May 2019 11:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVeFi-0003mo-Bb for guix-patches@gnu.org; Tue, 28 May 2019 11:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35962] [PATCH] gnu: guile: Disable unreliable out-of-memory test Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 May 2019 15:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35962@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155905812514468 (code B ref -1); Tue, 28 May 2019 15:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2019 15:42:05 +0000 Received: from localhost ([127.0.0.1]:56905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVeEn-0003lI-BH for submit@debbugs.gnu.org; Tue, 28 May 2019 11:42:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVeEj-0003kn-Gc for submit@debbugs.gnu.org; Tue, 28 May 2019 11:42:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:44773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVeEa-0005rx-Qp for submit@debbugs.gnu.org; Tue, 28 May 2019 11:41:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeEZ-0006S2-L6 for guix-patches@gnu.org; Tue, 28 May 2019 11:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVeER-0005WF-W4 for guix-patches@gnu.org; Tue, 28 May 2019 11:41:47 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:64372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVeEK-0002yM-Qw for guix-patches@gnu.org; Tue, 28 May 2019 11:41:40 -0400 Date: Tue, 28 May 2019 15:40:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1559058042; bh=5V1lFte71tWy9Vr7nsNHAKuD8kspBAZJxPshSaqq37k=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=Yw7qdNl8Y5UIfBnjAKNfKiK1UFOnR7CZGkljh6k2Uje5JKOqKr5CBVyvtBf0pO7rX afFKKkHvFbUp+ruTR75b5jy5jzQLOYQeuPkrePaCPiGiUQcTewpn5BQxO7+15VITDE b1c2udLKQZNcu5WM3Fcm+xAv9uYpbMa9CtgwaDKY= From: Carl Dong Message-ID: <0FIPGqhwNvPgRUebweUZXY0aaMXbTTE2vGPKNLINh-aqczZCdh_r_k7500N7hg7kR7E2zEaTUTQ9kRlnsmf_HCKifbSL1XABXNFqweqbwTk=@carldong.me> Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail 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: , Reply-To: Carl Dong Cc: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/guile-2.2-skip-oom-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-2.2)[source](patches): Add "guile-2.2-skip-oom-test.patch". --- gnu/local.mk | 1 + gnu/packages/guile.scm | 2 ++ .../patches/guile-2.2-skip-oom-test.patch | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gnu/packages/patches/guile-2.2-skip-oom-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a199f82f8..1133899f91 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -884,6 +884,7 @@ dist_patch_DATA = \ %D%/packages/patches/gst-plugins-good-libvpx-compat.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ + %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 67825ffc30..ae5fca513a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -228,6 +228,8 @@ without requiring the source code to be rewritten.") (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) (modules '((guix build utils))) + (patches (search-patches + "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything ;; from source, at the expense of significantly longer build diff --git a/gnu/packages/patches/guile-2.2-skip-oom-test.patch b/gnu/packages/patches/guile-2.2-skip-oom-test.patch new file mode 100644 index 0000000000..3c2bea9ad9 --- /dev/null +++ b/gnu/packages/patches/guile-2.2-skip-oom-test.patch @@ -0,0 +1,21 @@ +--- a/test-suite/standalone/Makefile.in 1969-12-31 19:00:00.000000000 -0500 ++++ b/test-suite/standalone/Makefile.in 2019-05-27 16:44:32.302355990 -0400 +@@ -103,7 +103,7 @@ + test-scm-c-bind-keyword-arguments$(EXEEXT) \ + test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \ + test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \ +- test-stack-overflow test-out-of-memory ++ test-stack-overflow + check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \ + test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \ + test-unwind$(EXEEXT) test-conversion$(EXEEXT) \ +@@ -1938,8 +1938,7 @@ + test-command-line-encoding test-command-line-encoding2 \ + test-language test-guild-compile $(am__append_3) \ + test-foreign-object-scm test-fast-slot-ref test-mb-regexp \ +- test-use-srfi $(am__append_5) test-stack-overflow \ +- test-out-of-memory ++ test-use-srfi $(am__append_5) test-stack-overflow + BUILT_SOURCES = $(am__append_2) + EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \ + test-import-order-c.scm test-import-order-d.scm \