From patchwork Tue May 7 19:45:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27170 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 9BCA727BBE9; Tue, 7 May 2024 20:46:21 +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 2A67927BBE2 for ; Tue, 7 May 2024 20:46:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4Ql3-0001b3-4A; Tue, 07 May 2024 15:45:49 -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 1s4Qks-0001Tc-Cv for guix-patches@gnu.org; Tue, 07 May 2024 15:45:42 -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 1s4Qks-0002Yl-3l for guix-patches@gnu.org; Tue, 07 May 2024 15:45:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4QlG-0002tj-Us for guix-patches@gnu.org; Tue, 07 May 2024 15:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v2 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: Tue, 07 May 2024 19:46: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.171511115711119 (code B ref 70693); Tue, 07 May 2024 19:46:02 +0000 Received: (at 70693) by debbugs.gnu.org; 7 May 2024 19:45:57 +0000 Received: from localhost ([127.0.0.1]:44358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4QlB-0002tC-H9 for submit@debbugs.gnu.org; Tue, 07 May 2024 15:45:57 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:45217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4Ql7-0002ss-Hh for 70693@debbugs.gnu.org; Tue, 07 May 2024 15:45:55 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id DA14027BBE2 for <70693@debbugs.gnu.org>; Tue, 7 May 2024 20:45:25 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 583373fe for <70693@debbugs.gnu.org>; Tue, 7 May 2024 19:45:24 +0000 (UTC) From: Christopher Baines Date: Tue, 7 May 2024 20:45:21 +0100 Message-ID: <86386e3f8cd94c44ac685abb9b722d746d22177a.1715111123.git.mail@cbaines.net> 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: 014875b29e68da6357a5323e6dd1eaa74a05b753 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 Tue May 7 19:45:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27168 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 88DB327BBEA; Tue, 7 May 2024 20:46:03 +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 2638E27BBE2 for ; Tue, 7 May 2024 20:45:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4Ql2-0001aq-RO; Tue, 07 May 2024 15:45:48 -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 1s4Qks-0001TS-21 for guix-patches@gnu.org; Tue, 07 May 2024 15:45:38 -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 1s4Qkr-0002Yh-Ps for guix-patches@gnu.org; Tue, 07 May 2024 15:45:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4QlG-0002tc-Hn for guix-patches@gnu.org; Tue, 07 May 2024 15:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v2 2/3] gnu: Add po4a-minimal. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 May 2024 19:46: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.171511115711113 (code B ref 70693); Tue, 07 May 2024 19:46:02 +0000 Received: (at 70693) by debbugs.gnu.org; 7 May 2024 19:45:57 +0000 Received: from localhost ([127.0.0.1]:44356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4QlB-0002t5-1F for submit@debbugs.gnu.org; Tue, 07 May 2024 15:45:57 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4Ql6-0002st-Cm for 70693@debbugs.gnu.org; Tue, 07 May 2024 15:45:54 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id E0EF427BBE9 for <70693@debbugs.gnu.org>; Tue, 7 May 2024 20:45:25 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 188cc1da for <70693@debbugs.gnu.org>; Tue, 7 May 2024 19:45:24 +0000 (UTC) From: Christopher Baines Date: Tue, 7 May 2024 20:45:22 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <86386e3f8cd94c44ac685abb9b722d746d22177a.1715111123.git.mail@cbaines.net> References: <86386e3f8cd94c44ac685abb9b722d746d22177a.1715111123.git.mail@cbaines.net> 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 1408cc4cb4..27212e3574 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -317,3 +317,16 @@ (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 + (modify-inputs (package-native-inputs po4a) + (delete "docbook-xml") + (delete "perl-test-pod") + (delete "texlive-updmap.cfg"))) + (arguments + (substitute-keyword-arguments (package-arguments po4a) + ((#:tests? _ #t) #f))) + (properties '((hidden? . #t))))) From patchwork Tue May 7 19:45:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27169 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 BD26027BBEA; Tue, 7 May 2024 20:46:10 +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 82AC627BBE2 for ; Tue, 7 May 2024 20:46:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4Ql3-0001eS-Kh; Tue, 07 May 2024 15:45:49 -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 1s4Qkv-0001WQ-Uw for guix-patches@gnu.org; Tue, 07 May 2024 15:45:43 -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 1s4Qkv-0002Yu-7h; Tue, 07 May 2024 15:45:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4QlH-0002tq-C3; Tue, 07 May 2024 15:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70693] [PATCH v2 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: Tue, 07 May 2024 19:46:03 +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.171511116211132 (code B ref 70693); Tue, 07 May 2024 19:46:03 +0000 Received: (at 70693) by debbugs.gnu.org; 7 May 2024 19:46:02 +0000 Received: from localhost ([127.0.0.1]:44360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4QlF-0002tR-Ru for submit@debbugs.gnu.org; Tue, 07 May 2024 15:46:02 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:54741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4Ql7-0002sr-HF for 70693@debbugs.gnu.org; Tue, 07 May 2024 15:45:57 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id E755F27BBEA for <70693@debbugs.gnu.org>; Tue, 7 May 2024 20:45:25 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a52e9907 for <70693@debbugs.gnu.org>; Tue, 7 May 2024 19:45:24 +0000 (UTC) From: Christopher Baines Date: Tue, 7 May 2024 20:45:23 +0100 Message-ID: <426f2432592afe22d59d9952f0078a20c9b18a4d.1715111123.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <86386e3f8cd94c44ac685abb9b722d746d22177a.1715111123.git.mail@cbaines.net> References: <86386e3f8cd94c44ac685abb9b722d746d22177a.1715111123.git.mail@cbaines.net> 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))