disable close_output test

diff --git a/debian/changelog b/debian/changelog
index 5248c9ab7fb6ff83b206fe40f3d9454ae0b4564d..26a5ccc6593c6eec6c83095490242b59fc56a98f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cargo (0.47.0-3) UNRELEASED; urgency=medium
+
+  * Disable close_output test for now, it is flaky. This is a test problem not
+    a cargo problem and will be re-enabled in 0.49.0.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 08 Dec 2020 01:42:30 +0000
+
 cargo (0.47.0-2) unstable; urgency=medium
 
   * Backport a patch to fix a test on i386.

diff --git a/debian/patches/2003_disable_close_output.patch b/debian/patches/2003_disable_close_output.patch
new file mode 100644 (file)
index 0000000..ff88081
--- /dev/null
+++ b/debian/patches/2003_disable_close_output.patch
@@ -0,0 +1,21 @@
+Description:
+ Disable close_output, it is flaky.
+ .
+ It is already fixed upstream in #8587 and #8668, however these depend on
+ subsequent changes to the same file and is hard to backport. So just disable
+ it for now in Debian, it is a test problem not a cargo problem.
+ .
+ FIXME remove this patch in cargo 0.49 which contains those above FRs.
+--- a/tests/testsuite/build.rs
++++ b/tests/testsuite/build.rs
+@@ -4924,8 +4924,8 @@
+     p.process(&p.bin("foo")).run();
+ }
+ 
+-#[cargo_test]
+-fn close_output() {
++#[allow(dead_code)]
++fn _close_output() {
+     // What happens when stdout or stderr is closed during a build.
+ 
+     // Server to know when rustc has spawned.

diff --git a/debian/patches/2005_disable_fetch_cross_tests.patch b/debian/patches/2005_disable_fetch_cross_tests.patch
deleted file mode 100644 (file)
index c205a92..0000000
--- a/debian/patches/2005_disable_fetch_cross_tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Disable fetch tests to allow build on arm and ppc architecture
- These tests are disabled to allow building on release architecture.
-Author: Vasudev Kamath <vasudev@copyninja.info>
-Bug: https://github.com/rust-lang/cargo/issues/5864
-Last-Update: 2018-08-05
-
---- a/tests/testsuite/fetch.rs
-+++ b/tests/testsuite/fetch.rs
-@@ -14,8 +14,8 @@
-     p.cargo("fetch").with_stdout("").run();
- }
- 
--#[cargo_test]
--fn fetch_all_platform_dependencies_when_no_target_is_given() {
-+#[allow(dead_code)]
-+fn _fetch_all_platform_dependencies_when_no_target_is_given() {
-     if cross_compile::disabled() {
-         return;
-     }
-@@ -61,8 +61,8 @@
-         .run();
- }
- 
--#[cargo_test]
--fn fetch_platform_specific_dependencies() {
-+#[allow(dead_code)]
-+fn _fetch_platform_specific_dependencies() {
-     if cross_compile::disabled() {
-         return;
-     }

diff --git a/debian/patches/series b/debian/patches/series
index fab15b81ba5cab40a1b779e9daa801e19c36212f..4566d286e128362bfc7002f7d761fe7145f3f202 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 u-8713.patch
 1005_relax_deprecated_diagnostic_message_check.patch
 2002_disable-net-tests.patch
-2005_disable_fetch_cross_tests.patch
+2003_disable_close_output.patch