From patchwork Thu May 9 14:35:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27211 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 BE1A027BBE9; Thu, 9 May 2024 15:37:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3F95F27BBE2 for ; Thu, 9 May 2024 15:37:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s54tA-00069E-Q5; Thu, 09 May 2024 10:36:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s54su-00063p-QQ for guix-patches@gnu.org; Thu, 09 May 2024 10:36:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s54su-0006zm-Bh for guix-patches@gnu.org; Thu, 09 May 2024 10:36:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s54tJ-0003jC-V5 for guix-patches@gnu.org; Thu, 09 May 2024 10:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v3 1/3] gnu: nss/fixed: Tweak performance test. References: <26a7162056587eb3c5855e6d35e70c15b9fb72cc.1714556505.git.mail@cbaines.net> In-Reply-To: <26a7162056587eb3c5855e6d35e70c15b9fb72cc.1714556505.git.mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 14:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70693@debbugs.gnu.org Received: via spool by 70693-submit@debbugs.gnu.org id=B70693.171526537714272 (code B ref 70693); Thu, 09 May 2024 14:37:01 +0000 Received: (at 70693) by debbugs.gnu.org; 9 May 2024 14:36:17 +0000 Received: from localhost ([127.0.0.1]:55614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54sb-0003i2-ES for submit@debbugs.gnu.org; Thu, 09 May 2024 10:36:17 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54sV-0003hl-Vd for 70693@debbugs.gnu.org; Thu, 09 May 2024 10:36:15 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id C49B227BBE2 for <70693@debbugs.gnu.org>; Thu, 9 May 2024 15:35:44 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6b822efb for <70693@debbugs.gnu.org>; Thu, 9 May 2024 14:35:44 +0000 (UTC) From: Christopher Baines Date: Thu, 9 May 2024 15:35:40 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As I'm seeing this test fail with results of 5 to 7 seconds. * gnu/packages/nss.scm (nss/fixed)[arguments]: Tweak a test to have a higher time threshold. Change-Id: Icb0551cd986acf67b2ba17dc8772a67b9747d31a --- gnu/packages/nss.scm | 8 ++++++++ 1 file changed, 8 insertions(+) base-commit: cf5f7a8bf9ca2288700fcf351bbca0fc341ec969 diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 162e748094..80bf627583 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -280,6 +280,14 @@ (define-public nss/fixed (setenv "USE_IP" "TRUE") (setenv "IP_ADDRESS" "127.0.0.1") + ;; This specific test is looking at performance "now + ;; verify that we can quickly dump a database", and + ;; we're not testing performance here (especially + ;; since we're using faketime), so raise the + ;; threshold + (substitute* "nss/tests/dbtests/dbtests.sh" + ((" -lt 5") " -lt 50")) + ;; The "PayPalEE.cert" certificate expires every six months, ;; leading to test failures: ;; . To From patchwork Thu May 9 14:35:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27210 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 6850927BBE2; Thu, 9 May 2024 15:36:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4024927BBEA for ; Thu, 9 May 2024 15:36:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s54sy-00064F-Fd; Thu, 09 May 2024 10:36:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s54su-00063n-PM for guix-patches@gnu.org; Thu, 09 May 2024 10:36:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s54su-0006zu-CT for guix-patches@gnu.org; Thu, 09 May 2024 10:36:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s54tK-0003jJ-D8 for guix-patches@gnu.org; Thu, 09 May 2024 10:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v3 2/3] gnu: Add po4a-minimal. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 14:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70693@debbugs.gnu.org Received: via spool by 70693-submit@debbugs.gnu.org id=B70693.171526537814278 (code B ref 70693); Thu, 09 May 2024 14:37:02 +0000 Received: (at 70693) by debbugs.gnu.org; 9 May 2024 14:36:18 +0000 Received: from localhost ([127.0.0.1]:55616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54sb-0003i9-Ot for submit@debbugs.gnu.org; Thu, 09 May 2024 10:36:18 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54sV-0003hj-Uw for 70693@debbugs.gnu.org; Thu, 09 May 2024 10:36:16 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id E92F327BBE9 for <70693@debbugs.gnu.org>; Thu, 9 May 2024 15:35:44 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 8a69f4b5 for <70693@debbugs.gnu.org>; Thu, 9 May 2024 14:35:44 +0000 (UTC) From: Christopher Baines Date: Thu, 9 May 2024 15:35:41 +0100 Message-ID: <3a9488a476a1cb365892f433342360d7dff776c7.1715265342.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The main reason is to avoid the texlive-updmap.cfg input indirectly pulling in nss, which has a very time consuming testsuite. * gnu/packages/gettext.scm (po4a-minimal): New variable. Change-Id: If8d46a18a02e57d5427852e8e122de01f970ded4 --- gnu/packages/gettext.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 1408cc4cb4..31fe95f6ad 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -317,3 +317,15 @@ (define-public po4a more interestingly, the maintenance of translations) using gettext tools on areas where they were not expected like documentation.") (license gpl2+))) + +(define-public po4a-minimal + (package/inherit po4a + (native-inputs + ;; Remove test dependencies, primarily to reduce the size of the + ;; dependency graph of the ‘guix’ package. + (modify-inputs (package-native-inputs po4a) + (delete "docbook-xml" "perl-test-pod" "texlive-updmap.cfg"))) + (arguments + (substitute-keyword-arguments (package-arguments po4a) + ((#:tests? _ #t) #f))) + (properties '((hidden? . #t))))) From patchwork Thu May 9 14:35:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27209 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 F231B27BBE9; Thu, 9 May 2024 15:36:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E13D27BBE2 for ; Thu, 9 May 2024 15:36:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s54t2-00064j-0N; Thu, 09 May 2024 10:36:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s54sy-00064U-Ht for guix-patches@gnu.org; Thu, 09 May 2024 10:36:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s54sx-00072K-V0; Thu, 09 May 2024 10:36:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s54tK-0003jQ-Qk; Thu, 09 May 2024 10:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v3 3/3] Use po4a-minimal for guix. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 14:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70693 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70693@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70693-submit@debbugs.gnu.org id=B70693.171526538014287 (code B ref 70693); Thu, 09 May 2024 14:37:02 +0000 Received: (at 70693) by debbugs.gnu.org; 9 May 2024 14:36:20 +0000 Received: from localhost ([127.0.0.1]:55618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54se-0003iN-BI for submit@debbugs.gnu.org; Thu, 09 May 2024 10:36:20 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:54331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s54sW-0003hk-9m for 70693@debbugs.gnu.org; Thu, 09 May 2024 10:36:16 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id EF94D27BBEA for <70693@debbugs.gnu.org>; Thu, 9 May 2024 15:35:44 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 513bbc67 for <70693@debbugs.gnu.org>; Thu, 9 May 2024 14:35:44 +0000 (UTC) From: Christopher Baines Date: Thu, 9 May 2024 15:35:42 +0100 Message-ID: <3e8a5857a16857bd0c48243ead1a49cfc1827df1.1715265342.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As this avoids the indirect dependency on nss, which has a testsuite that takes a long time to run. * gnu/packages/package-management.scm (guix)[native-inputs]: Use po4a-minimal. * guix/self.scm (%packages, translate-texi-manuals): Use po4a-minimal. Change-Id: Iac7555cc850c1618d3d54f1b290faa4f9cfb4f8a --- gnu/packages/package-management.scm | 2 +- guix/self.scm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index faa1a75aa0..631cbe1009 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -493,7 +493,7 @@ (define-public guix ("graphviz" ,graphviz-minimal) ("font-ghostscript" ,font-ghostscript) ;fonts for 'dot' ("help2man" ,help2man) - ("po4a" ,po4a))) + ("po4a" ,po4a-minimal))) (inputs `(("bzip2" ,bzip2) ("gzip" ,gzip) diff --git a/guix/self.scm b/guix/self.scm index 19c6d08e01..8c85684090 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -71,7 +71,7 @@ (define %packages ("bzip2" . ,(ref 'compression 'bzip2)) ("xz" . ,(ref 'compression 'xz)) ("git-minimal" . ,(ref 'version-control 'git-minimal)) - ("po4a" . ,(ref 'gettext 'po4a)) + ("po4a-minimal" . ,(ref 'gettext 'po4a-minimal)) ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) ("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain)) ("glibc-utf8-locales" . ,(delay @@ -291,8 +291,8 @@ (define* (locale-data source domain (define (translate-texi-manuals source) "Return the translated texinfo manuals built from SOURCE." - (define po4a - (specification->package "po4a")) + (define po4a-minimal + (specification->package "po4a-minimal")) (define gettext-minimal (specification->package "gettext-minimal")) @@ -317,7 +317,7 @@ (define (translate-texi-manuals source) (define (translate-tmp-texi po source output) "Translate Texinfo file SOURCE using messages from PO, and write the result to OUTPUT." - (invoke #+(file-append po4a "/bin/po4a-translate") + (invoke #+(file-append po4a-minimal "/bin/po4a-translate") "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" "-m" source "-p" po "-l" output))