mirror of
https://git.proxmox.com/git/rustc
synced 2025-08-25 21:28:07 +00:00
112 lines
4.0 KiB
Diff
112 lines
4.0 KiB
Diff
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
|
Date: Thu, 13 Jun 2024 11:16:39 +0200
|
|
Subject: compiletest: add ignore-hurd support and annotate some tests
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
These tests hang or make the box OOM
|
|
|
|
Forwarded: no
|
|
|
|
|
|
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
|
|
---
|
|
src/tools/compiletest/src/directive-list.rs | 1 +
|
|
src/tools/compiletest/src/header/tests.rs | 1 +
|
|
tests/crashes/115994.rs | 1 +
|
|
tests/run-make/long-linker-command-lines/foo.rs | 7 +++++++
|
|
tests/ui/associated-consts/issue-93775.rs | 1 +
|
|
tests/ui/issues/issue-74564-if-expr-stack-overflow.rs | 1 +
|
|
tests/ui/threads-sendsync/mpsc_stress.rs | 1 +
|
|
7 files changed, 13 insertions(+)
|
|
|
|
diff --git a/src/tools/compiletest/src/directive-list.rs b/src/tools/compiletest/src/directive-list.rs
|
|
index 01068af..7952c7a 100644
|
|
--- a/src/tools/compiletest/src/directive-list.rs
|
|
+++ b/src/tools/compiletest/src/directive-list.rs
|
|
@@ -58,6 +58,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
|
|
"ignore-gnu",
|
|
"ignore-haiku",
|
|
"ignore-horizon",
|
|
+ "ignore-hurd",
|
|
"ignore-i686-pc-windows-gnu",
|
|
"ignore-i686-pc-windows-msvc",
|
|
"ignore-illumos",
|
|
diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
|
|
index 618b66d..5708375 100644
|
|
--- a/src/tools/compiletest/src/header/tests.rs
|
|
+++ b/src/tools/compiletest/src/header/tests.rs
|
|
@@ -332,6 +332,7 @@ fn ignore_target() {
|
|
assert!(check_ignore(&config, "//@ ignore-x86_64-unknown-linux-gnu"));
|
|
assert!(check_ignore(&config, "//@ ignore-x86_64"));
|
|
assert!(check_ignore(&config, "//@ ignore-linux"));
|
|
+ assert!(check_ignore(&config, "//@ ignore-hurd"));
|
|
assert!(check_ignore(&config, "//@ ignore-unix"));
|
|
assert!(check_ignore(&config, "//@ ignore-gnu"));
|
|
assert!(check_ignore(&config, "//@ ignore-64bit"));
|
|
diff --git a/tests/crashes/115994.rs b/tests/crashes/115994.rs
|
|
index 23d1507..e0714e5 100644
|
|
--- a/tests/crashes/115994.rs
|
|
+++ b/tests/crashes/115994.rs
|
|
@@ -1,5 +1,6 @@
|
|
//@ known-bug: #115994
|
|
//@ compile-flags: -Cdebuginfo=2 --crate-type lib
|
|
+//@ ignore-hurd
|
|
|
|
// To prevent "overflow while adding drop-check rules".
|
|
use std::mem::ManuallyDrop;
|
|
diff --git a/tests/run-make/long-linker-command-lines/foo.rs b/tests/run-make/long-linker-command-lines/foo.rs
|
|
index 5b30c06..9ef0d5a 100644
|
|
--- a/tests/run-make/long-linker-command-lines/foo.rs
|
|
+++ b/tests/run-make/long-linker-command-lines/foo.rs
|
|
@@ -33,6 +33,13 @@ fn read_linker_args(path: &Path) -> String {
|
|
}
|
|
}
|
|
|
|
+#[cfg(target_os = "hurd")]
|
|
+// Debian: test causes build to fail on hurd
|
|
+fn main() {
|
|
+ return;
|
|
+}
|
|
+
|
|
+#[cfg(not(target_os = "hurd"))]
|
|
fn main() {
|
|
let ok = PathBuf::from("ok");
|
|
if env::var("YOU_ARE_A_LINKER").is_ok() {
|
|
diff --git a/tests/ui/associated-consts/issue-93775.rs b/tests/ui/associated-consts/issue-93775.rs
|
|
index 88e88b5..0981abc 100644
|
|
--- a/tests/ui/associated-consts/issue-93775.rs
|
|
+++ b/tests/ui/associated-consts/issue-93775.rs
|
|
@@ -4,6 +4,7 @@
|
|
|
|
//@ build-pass
|
|
// ignore-tidy-linelength
|
|
+//@ ignore-hurd
|
|
|
|
// Regression for #93775, needs build-pass to test it.
|
|
|
|
diff --git a/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
|
|
index c0ffed2..1e97353 100644
|
|
--- a/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
|
|
+++ b/tests/ui/issues/issue-74564-if-expr-stack-overflow.rs
|
|
@@ -1,5 +1,6 @@
|
|
//@ build-pass
|
|
// ignore-tidy-filelength
|
|
+//@ ignore-hurd
|
|
#![crate_type = "rlib"]
|
|
|
|
fn banana(v: &str) -> u32 {
|
|
diff --git a/tests/ui/threads-sendsync/mpsc_stress.rs b/tests/ui/threads-sendsync/mpsc_stress.rs
|
|
index fe0b47f..77ce6d5 100644
|
|
--- a/tests/ui/threads-sendsync/mpsc_stress.rs
|
|
+++ b/tests/ui/threads-sendsync/mpsc_stress.rs
|
|
@@ -1,6 +1,7 @@
|
|
//@ run-pass
|
|
//@ compile-flags:--test
|
|
//@ needs-threads
|
|
+//@ ignore-hurd
|
|
|
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
|
use std::sync::mpsc::{channel, RecvError, RecvTimeoutError, TryRecvError};
|