[bug#74958] [PATCH rust-team 0/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[bug#74958] [PATCH rust-team 0/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[Maxim Cournoyer]

And reinstate zerocopy tests, plus update.

Maxim Cournoyer (5):
  build/cargo.scm: Remove '--release' from default cargo-test-flags.
  gnu: rust-zerocopy-0.8: Reinstate all tests.
  gnu: rust-libc-0.2: Update to 0.2.168.
  gnu: rust-zerocopy-0.8: Update to 0.8.13.
  gnu: rust-zerocopy-derive-0.8: Update to 0.8.13.

 gnu/packages/crates-io.scm        | 21 +++++++--------------
 guix/build-system/cargo.scm       |  4 ++--
 guix/build/cargo-build-system.scm |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)


base-commit: eedec105d96526542d3886bb31e158d6a3c0e2d2
-- 
2.46.0

[bug#74958] [PATCH rust-team 1/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[Maxim Cournoyer]

The default behavior for 'cargo test' is to build in debug mode, and many test
suites expect support for things provided in this mode such as debug
assertions (see for example:
<https://github.com/google/zerocopy/issues/2143>).

* guix/build-system/cargo.scm (cargo-build): Remove '--release' from
 #:cargo-test-flags.
* guix/build/cargo-build-system.scm (check): Likewise.

Change-Id: I8a659c25bd33bc1bdfd88e440bd00bad09a5fc01
---
 guix/build-system/cargo.scm       | 4 ++--
 guix/build/cargo-build-system.scm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 9850969156..452f7f78d0 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -93,7 +93,7 @@ (define* (cargo-build name inputs
                       (test-target #f)
                       (vendor-dir "guix-vendor")
                       (cargo-build-flags ''("--release"))
-                      (cargo-test-flags ''("--release"))
+                      (cargo-test-flags ''())
                       (cargo-package-flags ''("--no-metadata" "--no-verify"))
                       (features ''())
                       (skip-build? #f)
@@ -153,7 +153,7 @@ (define* (cargo-cross-build name
                             (test-target #f)
                             (vendor-dir "guix-vendor")
                             (cargo-build-flags ''("--release"))
-                            (cargo-test-flags ''("--release"))
+                            (cargo-test-flags ''())
                             (cargo-package-flags ''("--no-metadata" "--no-verify"))
                             (cargo-target (cargo-triplet (or target system)))
                             (features ''())
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 453d759470..480134402f 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -252,7 +252,7 @@ (define* (check #:key
                 parallel-build?
                 parallel-tests?
                 tests?
-                (cargo-test-flags '("--release"))
+                (cargo-test-flags '())
                 #:allow-other-keys)
   "Run tests for a given Cargo package."
   (when tests?
-- 
2.46.0

[bug#74958] [PATCH rust-team 2/5] gnu: rust-zerocopy-0.8: Reinstate all tests.

[Maxim Cournoyer]

* gnu/packages/crates-io.scm (rust-zerocopy-0.8)
[arguments]: Delete #:cargo-test-flags.

Change-Id: I367347488ab5a6d45caaae611ada15b320c2808a
---
 gnu/packages/crates-io.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fce2afb76c..3a813fb9c9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -98705,14 +98705,7 @@ (define-public rust-zerocopy-0.8
                    (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-test-flags
-       '("--release" "--"
-         "--skip=error::tests::alignment_display"
-         "--skip=error::tests::size_display"
-         "--skip=error::tests::validity_display"
-         "--skip=layout::tests::test_validate_cast_and_convert_metadata"
-         "--skip=util::tests::test_round_down_to_next_multiple_of_alignment_zerocopy_panic_in_const_and_vec_try_reserve")
-       #:cargo-inputs (("rust-zerocopy-derive" ,rust-zerocopy-derive-0.8))
+     `(#:cargo-inputs (("rust-zerocopy-derive" ,rust-zerocopy-derive-0.8))
        #:cargo-development-inputs
        (("rust-elain" ,rust-elain-0.3)
         ("rust-itertools" ,rust-itertools-0.11)
-- 
2.46.0

[bug#74958] [PATCH rust-team 3/5] gnu: rust-libc-0.2: Update to 0.2.168.

[Maxim Cournoyer]

* gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.168.

Change-Id: I6a135eccfaf3115c6f891269417e11837260a2b0
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3a813fb9c9..a806a03bf5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -40293,14 +40293,14 @@ (define-public rust-lexopt-0.3
 (define-public rust-libc-0.2
   (package
     (name "rust-libc")
-    (version "0.2.162")
+    (version "0.2.168")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "libc" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1633a00yyx45kzx9r54fndvr8njsjqyr7zl12mzgsmgyczg8glhq"))))
+        (base32 "0vab4inpw0dz78nii02hsxp1skqn06xzh64psw8wl1h63scb5bjs"))))
     (build-system cargo-build-system)
     (arguments
      (list #:cargo-inputs
-- 
2.46.0

[bug#74958] [PATCH rust-team 4/5] gnu: rust-zerocopy-0.8: Update to 0.8.13.

[Maxim Cournoyer]

* gnu/packages/crates-io.scm (rust-zerocopy-0.8): Update to 0.8.13.

Change-Id: Idfb553a2f493e4555fd4cfce8c4759bcfb2cfcc7
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a806a03bf5..a9c038aad8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -98690,14 +98690,14 @@ (define-public rust-zbus-xml-4
 (define-public rust-zerocopy-0.8
   (package
     (name "rust-zerocopy")
-    (version "0.8.9")
+    (version "0.8.13")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "zerocopy" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "170h9r9cz0cfdfka04v4dl6zsbzl45cqr6k7x2g4lbrmiw7nk7pl"))
+        (base32 "07g29nsr3hvf2vyh9wk39l3yg144hprjx7aykvkd5gzka6s4m4b7"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
-- 
2.46.0

[bug#74958] [PATCH rust-team 5/5] gnu: rust-zerocopy-derive-0.8: Update to 0.8.13.

[Maxim Cournoyer]

* gnu/packages/crates-io.scm (rust-zerocopy-derive-0.8): Update to 0.8.13.

Change-Id: Idbbeae3aaae337ec62f64ff6ab520887234fe229
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a9c038aad8..c17b69aab1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -98790,14 +98790,14 @@ (define-public rust-zerocopy-0.3
 (define-public rust-zerocopy-derive-0.8
   (package
     (name "rust-zerocopy-derive")
-    (version "0.8.9")
+    (version "0.8.13")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "zerocopy-derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1cd712qs5ccn6diy53ymk8vkprgcmnx1gvg3x3xsdxqxi362ywzs"))
+        (base32 "0pgjqk2w5wrw752wfsxgf7rwqjlk1r4vq5iky2fjijh38cxdg23r"))
        (modules '((guix build utils)))
        (snippet
         '(begin (substitute* "Cargo.toml"
-- 
2.46.0

[bug#74958] [PATCH rust-team 1/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[Efraim Flashner]

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

IIRC we chose to use '--release' for cargo-test-flags to minimize the
amount of rebuilding we did with each package.  If the tests are
expected to be run not in release mode then I guess we should change it.

I'll apply the patch to rust-team and then go through and see about
removing the cargo-test-flags from various packages.

On Thu, Dec 19, 2024 at 10:46:18AM +0900, Maxim Cournoyer wrote:
> The default behavior for 'cargo test' is to build in debug mode, and many test
> suites expect support for things provided in this mode such as debug
> assertions (see for example:
> <https://github.com/google/zerocopy/issues/2143>).
> 
> * guix/build-system/cargo.scm (cargo-build): Remove '--release' from
>  #:cargo-test-flags.
> * guix/build/cargo-build-system.scm (check): Likewise.
> 
> Change-Id: I8a659c25bd33bc1bdfd88e440bd00bad09a5fc01
> ---
>  guix/build-system/cargo.scm       | 4 ++--
>  guix/build/cargo-build-system.scm | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
> index 9850969156..452f7f78d0 100644
> --- a/guix/build-system/cargo.scm
> +++ b/guix/build-system/cargo.scm
> @@ -93,7 +93,7 @@ (define* (cargo-build name inputs
>                        (test-target #f)
>                        (vendor-dir "guix-vendor")
>                        (cargo-build-flags ''("--release"))
> -                      (cargo-test-flags ''("--release"))
> +                      (cargo-test-flags ''())
>                        (cargo-package-flags ''("--no-metadata" "--no-verify"))
>                        (features ''())
>                        (skip-build? #f)
> @@ -153,7 +153,7 @@ (define* (cargo-cross-build name
>                              (test-target #f)
>                              (vendor-dir "guix-vendor")
>                              (cargo-build-flags ''("--release"))
> -                            (cargo-test-flags ''("--release"))
> +                            (cargo-test-flags ''())
>                              (cargo-package-flags ''("--no-metadata" "--no-verify"))
>                              (cargo-target (cargo-triplet (or target system)))
>                              (features ''())
> diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
> index 453d759470..480134402f 100644
> --- a/guix/build/cargo-build-system.scm
> +++ b/guix/build/cargo-build-system.scm
> @@ -252,7 +252,7 @@ (define* (check #:key
>                  parallel-build?
>                  parallel-tests?
>                  tests?
> -                (cargo-test-flags '("--release"))
> +                (cargo-test-flags '())
>                  #:allow-other-keys)
>    "Run tests for a given Cargo package."
>    (when tests?
> -- 
> 2.46.0
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#74958] [PATCH rust-team 1/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[Maxim Cournoyer]

Hi,

Efraim Flashner <efraim@flashner.co.il> writes:

> IIRC we chose to use '--release' for cargo-test-flags to minimize the
> amount of rebuilding we did with each package.  If the tests are
> expected to be run not in release mode then I guess we should change it.

I see.  I guess it's worth it, I expect it'll reduce the occurrence of
the dreaded 'why does this fail in Guix and not in upstream's CI?'
question.

> I'll apply the patch to rust-team and then go through and see about
> removing the cargo-test-flags from various packages.

Sounds good, thanks for your reactivity!

-- 
Thanks,
Maxim

bug#74958: [PATCH rust-team 1/5] build/cargo.scm: Remove '--release' from default cargo-test-flags.

[Efraim Flashner]

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

I tried removing the '--release' from some of the cargo-test-flags and I
found other packaging errors that allowed me to remove entire
cargo-test-flags and not just '--release'. I've pushed this to the
rust-team branch.  This should help improve the quality of our rust
packages.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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