compiletest: add ignore-hurd support and annotate some tests

These tests hang or make the box OOM

Forwarded: no

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic upstream
Gbp-Pq: Name u-hurd-tests.patch

diff --git a/src/tools/compiletest/src/directive-list.rs b/src/tools/compiletest/src/directive-list.rs
index 01068af3e8c246a466178647554fde392dd3d973..7952c7af0a99b8296263394d96b8f2c95abc03c0 100644 (file)
--- 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 618b66dfd4cb6b89f0f74049a559d244be2f6ad9..570837587567ce2eb77714abb879d9d49d8bed6c 100644 (file)
--- 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 23d1507136f7ca62ff0d2a24fb9a63eb9bba8589..e0714e5b93e0e0c92b08447dd3fd26c1bd11ebda 100644 (file)
--- 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 5b30c06fac9e023b6955ac9e1f50ce5d8864d7b7..9ef0d5add4630649d72b10c76c8c60dfc05c2437 100644 (file)
--- 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 88e88b559870fd5c35e976571ddad710b9a1fa32..0981abc1fb9bfc73c74f505d26eebed949182cba 100644 (file)
--- 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 c0ffed27e6fb4687d6bd7b2e82f65f1ddc274ce3..1e97353af06285c98f83af34040e797bafb0776a 100644 (file)
--- 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 fe0b47f3a842e4b1b5da4f4445186320c5c8b67a..77ce6d5f0f1c31a9378a85232527fe8e7d3796d4 100644 (file)
--- 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};