[bug#70693] [PATCH] gnu: nss/fixed: Tweak performance test.

[bug#70693] [PATCH] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

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(+)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 162e748094..60bc4d52de 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* "tests/dbtests/dbtests.sh"
+                           ((" -lt 5") " -lt 50"))
+
                          ;; The "PayPalEE.cert" certificate expires every six months,
                          ;; leading to test failures:
                          ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To

base-commit: 7d4ae2fca723114fb1df56de33b82177fbc4d0a6
-- 
2.41.0

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

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(+)

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:
                          ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To

base-commit: 7d4ae2fca723114fb1df56de33b82177fbc4d0a6
-- 
2.41.0

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Maxim Cournoyer]

Christopher Baines <mail@cbaines.net> writes:

> 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

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Ludovic Courtès]

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> Christopher Baines <mail@cbaines.net> writes:
>
>> 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
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

+1!

Not immediately related but Christina submitted patches to make nss
reproducible and to upgrade it that we should look into while we’re at
it:

  https://issues.guix.gnu.org/40316

Ludo’.

[bug#70693] [PATCH v2 1/3] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

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(+)

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:
                          ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To

base-commit: 014875b29e68da6357a5323e6dd1eaa74a05b753
-- 
2.41.0

[bug#70693] [PATCH v2 2/3] gnu: Add po4a-minimal.

[Christopher Baines]

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)))))
-- 
2.41.0

[bug#70693] [PATCH v2 3/3] Use po4a-minimal for guix.

[Christopher Baines]

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))
 
-- 
2.41.0

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> Christopher Baines <mail@cbaines.net> writes:
>>
>>> 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
>>
>> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
>
> +1!
>
> Not immediately related but Christina submitted patches to make nss
> reproducible and to upgrade it that we should look into while we’re at
> it:
>
>   https://issues.guix.gnu.org/40316

I haven't got around to looking at that, but the data service failed to
process the v1 patch, the job timed out after 72 hours.

I don't think that necessarily means that patch hasn't worked, it's just
that we needed to build nss (because grafts, see #61363) to compute the
guix derivation for each system. As Ludo pointed out to me on IRC
though, that can probably be avoided so I've sent a v2 series that
includes a couple of patches to remove the link between guix and nss via
packages needed for the po4a tests.

Lets see if this gets further and we hopefully see how nss builds on
different systems.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70693] [PATCH v2 3/3] Use po4a-minimal for guix.

[Ludovic Courtès]

Hi,

Christopher Baines <mail@cbaines.net> skribis:

> 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

LGTM, thanks!

Ludo’.

[bug#70693] [PATCH v2 2/3] gnu: Add po4a-minimal.

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> 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

[...]

> +(define-public po4a-minimal
> +  (package/inherit po4a
> +    (native-inputs
> +     ;; Remove test dependencies

Maybe add: “, primarily to reduce the size of the dependency graph of the
‘guix’ package.”

> +     (modify-inputs (package-native-inputs po4a)
> +       (delete "docbook-xml")
> +       (delete "perl-test-pod")
> +       (delete "texlive-updmap.cfg")))

This can be: (delete "docbook-xml" "perl-test-pod" "texlive-updmap.cfg").

Otherwise LGTM!

Ludo’.

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> I don't think that necessarily means that patch hasn't worked, it's just
> that we needed to build nss (because grafts, see #61363) to compute the
> guix derivation for each system. As Ludo pointed out to me on IRC
> though, that can probably be avoided so I've sent a v2 series that
> includes a couple of patches to remove the link between guix and nss via
> packages needed for the po4a tests.

It would still make sense to apply the initial patch here, IMO.

Also, we could create an ‘nss-upgrade’ branch to remove the graft and
upgrade ‘nss’, also applying the reproducibility patches that Christina
posted.

WDYT?

Thanks,
Ludo’.

[bug#70693] [PATCH v3 1/3] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

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(+)

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:
                          ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>.  To

base-commit: cf5f7a8bf9ca2288700fcf351bbca0fc341ec969
-- 
2.41.0

[bug#70693] [PATCH v3 2/3] gnu: Add po4a-minimal.

[Christopher Baines]

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)))))
-- 
2.41.0

[bug#70693] [PATCH v3 3/3] Use po4a-minimal for guix.

[Christopher Baines]

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))
 
-- 
2.41.0

[bug#70693] [PATCH v2 2/3] gnu: Add po4a-minimal.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Christopher Baines <mail@cbaines.net> skribis:
>
>> 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
>
> [...]
>
>> +(define-public po4a-minimal
>> +  (package/inherit po4a
>> +    (native-inputs
>> +     ;; Remove test dependencies
>
> Maybe add: “, primarily to reduce the size of the dependency graph of the
> ‘guix’ package.”
>
>> +     (modify-inputs (package-native-inputs po4a)
>> +       (delete "docbook-xml")
>> +       (delete "perl-test-pod")
>> +       (delete "texlive-updmap.cfg")))
>
> This can be: (delete "docbook-xml" "perl-test-pod" "texlive-updmap.cfg").

I've sent a v3 with these changes now.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70693] [PATCH v2] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1141 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Christopher Baines <mail@cbaines.net> skribis:
>
>> I don't think that necessarily means that patch hasn't worked, it's just
>> that we needed to build nss (because grafts, see #61363) to compute the
>> guix derivation for each system. As Ludo pointed out to me on IRC
>> though, that can probably be avoided so I've sent a v2 series that
>> includes a couple of patches to remove the link between guix and nss via
>> packages needed for the po4a tests.
>
> It would still make sense to apply the initial patch here, IMO.

Personally I'm waiting for QA to build things since I want to see if
this does fix nss on the 4 systems it's currently broken on, and so that
there's substitutes available if and when this is merged.

The large number of builds recently on the master branch might delay
this though.

> Also, we could create an ‘nss-upgrade’ branch to remove the graft and
> upgrade ‘nss’, also applying the reproducibility patches that Christina
> posted.
>
> WDYT?

I don't mind, if it doesn't happen on core-updates then that seems like
an OK approach.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70693] [PATCH v3 1/3] gnu: nss/fixed: Tweak performance test.

[Ludovic Courtès]

Hi!

LGTM to me, please push!

Ludo’.

bug#70693: [PATCH v3 1/3] gnu: nss/fixed: Tweak performance test.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> Hi!
>
> LGTM to me, please push!

Things are building, so I've pushed this to master as
7b0f145802f0c2c785014293d748721678fef824.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]