Try to deal with the various test failures as suggested by upstream

diff --git a/debian/changelog b/debian/changelog
index df3c5f8a644388c3bf38d409915c9e4901d9a4f9..9a298d2f086027f4ec8d3d30fb1f42dd330428d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cargo (0.32.0-1~exp2) UNRELEASED; urgency=medium
+
+  * Try to deal with the various test failures as suggested by upstream.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 22 Jan 2019 20:07:48 -0800
+
 cargo (0.32.0-1~exp1) experimental; urgency=medium
 
   [ upstream ]

diff --git a/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch b/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch
new file mode 100644 (file)
index 0000000..c4d6e8b
--- /dev/null
+++ b/debian/patches/1003_increase_timeout_for_slow_arches_like_mips.patch
@@ -0,0 +1,14 @@
+Description: Increase timeout for slow arches like mips
+Author: Ximin Luo <infinity0@debian.org>
+Bug: https://github.com/rust-lang/cargo/issues/6491
+--- a/tests/testsuite/support/resolver.rs
++++ b/tests/testsuite/support/resolver.rs
+@@ -118,7 +118,7 @@
+ 
+     // The largest test in our suite takes less then 30 sec.
+     // So lets fail the test if we have ben running for two long.
+-    assert!(start.elapsed() < Duration::from_secs(60));
++    assert!(start.elapsed() < Duration::from_secs(240));
+     resolve
+ }
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 84fbe421aca44081b2e299082c10d8cc11f769cd..78bdf0900c5d1db1658e5d266c18980ebaa3007f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 1001_fix_inc_exc_tests.patch
 1002_fix_doc_tests_order_hash.patch
+1003_increase_timeout_for_slow_arches_like_mips.patch
 2007_sparc64_disable_incremental_build.patch
 2002_disable-net-tests.patch
 2005_disable_fetch_cross_tests.patch

diff --git a/debian/rules b/debian/rules
index 014ae4706fc33798b9074af902bf1b8a2410d188..e50ac0528fee0b1e47096e22a097f91a4c6b8873 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,10 @@ export CARGO_HOME = $(CURDIR)/debian/cargo_home
 export DEB_CARGO_CRATE=cargo_$(DEB_VERSION_UPSTREAM)
 export DEB_CARGO_PACKAGE=cargo
 
+# don't shrink, this can take ages
+# see https://github.com/rust-lang/cargo/issues/6490 for details
+export PROPTEST_MAX_SHRINK_ITERS = 0
+
 # To run a specific test, run something like:
 #   $ debian/rules override_dh_auto_test-arch \
 #     CARGO_TEST_FLAGS="package::include -- <args ...>"