From f9fab79c2d84a67cc7b89fd0192e05001e5c72d3 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Sat, 9 Oct 2021 00:22:47 +0100
Subject: [PATCH] Ignore more spurious test failures, and filed upstream

---
 debian/changelog                             |  3 ++-
 debian/patches/d-custom-debuginfo-path.patch | 13 ++++++++++++-
 debian/patches/series                        |  1 +
 debian/patches/u-ignore-bpf-test.patch       |  9 +++++++++
 debian/rules                                 |  4 +++-
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/u-ignore-bpf-test.patch

diff --git a/debian/changelog b/debian/changelog
index 9c5459332c..988c846170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-rustc (1.54.0+dfsg1-2) UNRELEASED; urgency=medium
+rustc (1.54.0+dfsg1-1) UNRELEASED; urgency=medium
 
   * Upload to unstable.
   * Re-enable backported patch for armhf & reset its allowed-failures.
   * Add compatibility patch for cargo 0.47.
+  * Ignore more spurious test failures, and filed upstream.
 
  -- Ximin Luo <infinity0@debian.org>  Fri, 08 Oct 2021 14:31:10 +0100
 
diff --git a/debian/patches/d-custom-debuginfo-path.patch b/debian/patches/d-custom-debuginfo-path.patch
index ee20319d24..b0f0522626 100644
--- a/debian/patches/d-custom-debuginfo-path.patch
+++ b/debian/patches/d-custom-debuginfo-path.patch
@@ -1,6 +1,6 @@
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -819,10 +819,9 @@
+@@ -824,10 +824,9 @@
  
          match which {
              GitRepo::Rustc => {
@@ -13,3 +13,14 @@
          }
      }
  
+--- a/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
++++ b/src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs
+@@ -7,7 +7,7 @@
+ // true automatically. If paths to std library hasn't been remapped, we use the
+ // above simulate-remapped-rust-src-base option to do it temporarily
+ 
+-// CHECK: !DIFile(filename: "{{/rustc/.*/library/std/src/panic.rs}}"
++// CHECK: !DIFile(filename: "{{/usr/src/rustc-.*/library/std/src/panic.rs}}"
+ fn main() {
+     std::thread::spawn(|| {
+         println!("hello");
diff --git a/debian/patches/series b/debian/patches/series
index a8914dc847..195c96c1dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@ u-ignore-endian-big-diff.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-ignore-ppc-hangs.patch
+u-ignore-bpf-test.patch
 u-rustc-llvm-cross-flags.patch
 u-reproducible-dl-stage0.patch
 u-make-tests-work-without-rpath.patch
diff --git a/debian/patches/u-ignore-bpf-test.patch b/debian/patches/u-ignore-bpf-test.patch
new file mode 100644
index 0000000000..5b37f7f217
--- /dev/null
+++ b/debian/patches/u-ignore-bpf-test.patch
@@ -0,0 +1,9 @@
+Bug: https://github.com/rust-lang/rust/issues/89689
+
+--- a/src/test/assembly/asm/bpf-types.rs
++++ b/src/test/assembly/asm/bpf-types.rs
+@@ -1,3 +1,4 @@
++// ignore-test
+ // min-llvm-version: 10.0.1
+ // assembly-output: emit-asm
+ // compile-flags: --target bpfel-unknown-none -C target_feature=+alu32
diff --git a/debian/rules b/debian/rules
index 2fa6cba3df..2b62965996 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,9 @@ NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 RUSTBUILD = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py $(NJOBS)
 RUSTBUILD_FLAGS = --stage 2 --config debian/config.toml -vvv --on-fail env
-RUSTBUILD_TEST = $(RUSTBUILD) test --no-fail-fast
+# rust-tidy depends on lots of modules that we strip out of the build.
+# it also tries to access the network for some reason. so just disable it.
+RUSTBUILD_TEST = $(RUSTBUILD) test --no-fail-fast --exclude src/tools/tidy
 # To run a specific test, run something like:
 #   $ debian/rules override_dh_auto_test-arch \
 #     RUSTBUILD_TEST_FLAGS="src/test/run-make --test-args extern-fn-struct"