Apply upstream patch to fix tests on 32-bit architectures.

diff --git a/src/arbitrary/debian/changelog b/src/arbitrary/debian/changelog
index fca4aa458af1dc973f3bff542440866bd8a929b9..be50d9f4af747255c26fe07e16f494a443c41fe7 100644 (file)
--- a/src/arbitrary/debian/changelog
+++ b/src/arbitrary/debian/changelog
@@ -1,3 +1,11 @@
+rust-arbitrary (1.0.3-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package arbitrary 1.0.3 from crates.io using debcargo 2.5.0
+  * Apply upstream patch to fix tests on 32-bit architectures.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 29 Jan 2022 10:47:25 +0000
+
 rust-arbitrary (1.0.3-1) unstable; urgency=medium
 
   * Package arbitrary 1.0.3 from crates.io using debcargo 2.5.0

diff --git a/src/arbitrary/debian/copyright.debcargo.hint b/src/arbitrary/debian/copyright.debcargo.hint
index fc201538b3ca010507ab5679aa5f2a39a668c353..eaf43a0d7cbd2164b322f4915faf1b166d309a45 100644 (file)
--- a/src/arbitrary/debian/copyright.debcargo.hint
+++ b/src/arbitrary/debian/copyright.debcargo.hint
@@ -47,8 +47,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2021 Sylvestre Ledru <sylvestre@debian.org>
+ 2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2021-2022 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/arbitrary/debian/patches/fix-tests-32-bit.patch b/src/arbitrary/debian/patches/fix-tests-32-bit.patch
new file mode 100644 (file)
index 0000000..a1c9412
--- /dev/null
+++ b/src/arbitrary/debian/patches/fix-tests-32-bit.patch
@@ -0,0 +1,31 @@
+commit 2e684b4793883a37c3b2864e47dcfbd7517afb7c
+Author: Nick Fitzgerald <fitzgen@gmail.com>
+Date:   Mon Jan 24 11:06:31 2022 -0800
+
+    Fix tests for non 64-bit architectures
+    
+    Fixes #95
+
+diff --git a/tests/derive.rs b/tests/derive.rs
+old mode 100644
+new mode 100755
+index 9dfbbd5b8..adf118855
+--- a/tests/derive.rs
++++ b/tests/derive.rs
+@@ -164,7 +164,7 @@ fn one_lifetime() {
+     assert_eq!("abc", lifetime.alpha);
+ 
+     let (lower, upper) = <OneLifetime as Arbitrary>::size_hint(0);
+-    assert_eq!(lower, 8);
++    assert_eq!(lower, std::mem::size_of::<usize>());
+     assert_eq!(upper, None);
+ }
+ 
+@@ -183,6 +183,6 @@ fn two_lifetimes() {
+     assert_eq!("def", lifetime.beta);
+ 
+     let (lower, upper) = <TwoLifetimes as Arbitrary>::size_hint(0);
+-    assert_eq!(lower, 16);
++    assert_eq!(lower, std::mem::size_of::<usize>() * 2);
+     assert_eq!(upper, None);
+ }

diff --git a/src/arbitrary/debian/patches/series b/src/arbitrary/debian/patches/series
new file mode 100644 (file)
index 0000000..164c3f7
--- /dev/null
+++ b/src/arbitrary/debian/patches/series
@@ -0,0 +1 @@
+fix-tests-32-bit.patch