fix/ignore some test failures

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
This commit is contained in:
Fabian Grünbichler 2024-12-04 18:05:08 +01:00
parent 5daaf79abb
commit f18abfb276
4 changed files with 52 additions and 3 deletions

View File

@ -22,7 +22,8 @@ using a GNU linker).
Forwarded: no
---
compiler/rustc_codegen_ssa/src/back/link.rs | 7 +++++++
1 file changed, 7 insertions(+)
tests/run-make/dylib-soname/rmake.rs | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 34dc599..2fbe842 100644
@ -42,3 +43,21 @@ index 34dc599..2fbe842 100644
}
// Write the NatVis debugger visualizer files for each crate to the temp directory and gather the file paths.
diff --git a/tests/run-make/dylib-soname/rmake.rs b/tests/run-make/dylib-soname/rmake.rs
index 714997c..653a0fe 100644
--- a/tests/run-make/dylib-soname/rmake.rs
+++ b/tests/run-make/dylib-soname/rmake.rs
@@ -3,10 +3,12 @@
//@ only-linux
//@ ignore-cross-compile
-
use run_make_support::{cmd, run_in_tmpdir, rustc};
fn main() {
+ // Debian: we patch rustc to intentionally insert the soname
+ return;
+
let check = |ty: &str| {
rustc().crate_name("foo").crate_type(ty).input("foo.rs").run();
cmd("readelf").arg("-d").arg("libfoo.so").run()

View File

@ -0,0 +1,29 @@
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <git@fabian.gruenbichler.email>
Date: Wed, 4 Dec 2024 17:50:43 +0100
Subject: ci_rustc: disable test that requires upstream git repo
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Gbp-Pq: Topic build
Forwarded: not-needed
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
---
src/bootstrap/src/core/builder/tests.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 4fb7cf4..f0ab410 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -212,7 +212,8 @@ fn alias_and_path_for_library() {
assert_eq!(first(cache.all::<doc::Std>()), &[doc_std!(A => A, stage = 0)]);
}
-#[test]
+// Debian: this test doesn't work since it tries to detect dirty git state..
+#[allow(dead_code)]
fn ci_rustc_if_unchanged_logic() {
let config = Config::parse_inner(
Flags::parse(&[

View File

@ -11,14 +11,14 @@ Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
1 file changed, 2 insertions(+)
diff --git a/tests/ui/traits/object/print_vtable_sizes.rs b/tests/ui/traits/object/print_vtable_sizes.rs
index 2b1745d..5f1b61c 100644
index 2b1745d..fd94386 100644
--- a/tests/ui/traits/object/print_vtable_sizes.rs
+++ b/tests/ui/traits/object/print_vtable_sizes.rs
@@ -1,5 +1,7 @@
//@ check-pass
//@ compile-flags: -Z print-vtable-sizes
+//Debian: broken floats break the expected output on i386
+//@ ignore-i686
+//@ ignore-i686-unknown-linux-gnu
#![crate_type = "lib"]
trait A<T: help::V>: AsRef<[T::V]> + AsMut<[T::V]> {}

View File

@ -42,3 +42,4 @@ build/bootstrap-tests-disable-compiler-rt-optimizing.patch
build/disable-broken-i386-tests.patch
build/ignore-broken-debuginfo-tests.patch
vendor/blake3-skip-embedded-C-code-use-pure-implementation.patch
build/ci_rustc-disable-test-that-requires-upstream-git-repo.patch