From 95560c14a35246a936c2059cf4fc466248dd6802 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 29 Feb 2016 09:34:13 -0800 Subject: [PATCH] test: Mark all rpass-valgrind as no-prefer-dynamic This applies the same fix as added in 595d5b2f which is to just compile all valgrind tests statically instead of dynamically. It looks like this is a resurgence of either #30383 or #31328 in some weird fashion. I'm not actually sure what's going on with the bots, and it's unclear whether this is a valgrind bug or a libstd bug, but for now let's just get things landing again. Closes #30383 --- src/test/run-pass-valgrind/cast-enum-with-dtor.rs | 2 ++ src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs | 1 + src/test/run-pass-valgrind/cleanup-stdin.rs | 2 ++ src/test/run-pass-valgrind/dst-dtor-1.rs | 2 ++ src/test/run-pass-valgrind/dst-dtor-2.rs | 2 ++ src/test/run-pass-valgrind/exit-flushes.rs | 1 + src/test/run-pass-valgrind/osx-frameworks.rs | 1 + 7 files changed, 11 insertions(+) diff --git a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs b/src/test/run-pass-valgrind/cast-enum-with-dtor.rs index b13e34256d2..247e82c2f09 100644 --- a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs +++ b/src/test/run-pass-valgrind/cast-enum-with-dtor.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic + #![allow(dead_code)] #![feature(const_fn)] diff --git a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs b/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs index 0bbb9ed1285..220968529de 100644 --- a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs +++ b/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic // This would previously leak the Box because we wouldn't // schedule cleanups when auto borrowing trait objects. diff --git a/src/test/run-pass-valgrind/cleanup-stdin.rs b/src/test/run-pass-valgrind/cleanup-stdin.rs index dcdce50c1e9..b7c94ed6944 100644 --- a/src/test/run-pass-valgrind/cleanup-stdin.rs +++ b/src/test/run-pass-valgrind/cleanup-stdin.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic + fn main() { let _ = std::io::stdin(); let _ = std::io::stdout(); diff --git a/src/test/run-pass-valgrind/dst-dtor-1.rs b/src/test/run-pass-valgrind/dst-dtor-1.rs index d051b7b491b..995da8c73fa 100644 --- a/src/test/run-pass-valgrind/dst-dtor-1.rs +++ b/src/test/run-pass-valgrind/dst-dtor-1.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic + static mut DROP_RAN: bool = false; struct Foo; diff --git a/src/test/run-pass-valgrind/dst-dtor-2.rs b/src/test/run-pass-valgrind/dst-dtor-2.rs index a89873b1277..471169340d7 100644 --- a/src/test/run-pass-valgrind/dst-dtor-2.rs +++ b/src/test/run-pass-valgrind/dst-dtor-2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic + static mut DROP_RAN: isize = 0; struct Foo; diff --git a/src/test/run-pass-valgrind/exit-flushes.rs b/src/test/run-pass-valgrind/exit-flushes.rs index 632693dd728..1897b921401 100644 --- a/src/test/run-pass-valgrind/exit-flushes.rs +++ b/src/test/run-pass-valgrind/exit-flushes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic // ignore-macos this needs valgrind 3.11 or higher; see // https://github.com/rust-lang/rust/pull/30365#issuecomment-165763679 diff --git a/src/test/run-pass-valgrind/osx-frameworks.rs b/src/test/run-pass-valgrind/osx-frameworks.rs index 41b34dc79bd..468a20db6f7 100644 --- a/src/test/run-pass-valgrind/osx-frameworks.rs +++ b/src/test/run-pass-valgrind/osx-frameworks.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// no-prefer-dynamic // pretty-expanded FIXME #23616 #![feature(libc)]