Auto merge of #5859 - jeizsm:master, r=alexcrichton

check target env in test when use targets Hello. It also should check for target vendor but it's still unstable for some reason rust-lang/rust#29718
rust-lang · Aug 3, 2018 · 67c4796 · 67c4796
2 parents 5badfb1 + b686606
commit 67c4796
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/testsuite/cfg.rs b/tests/testsuite/cfg.rs
@@ -410,7 +410,7 @@ fn any_ok() {
 
 // https://github.com/rust-lang/cargo/issues/5313
 #[test]
-#[cfg(all(target_arch = "x86_64", target_os = "linux"))]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
 fn cfg_looks_at_rustflags_for_target() {
     let p = project()
         .file(

diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs
@@ -181,7 +181,7 @@ fn features() {
 }
 
 #[test]
-#[cfg(all(target_arch = "x86_64", target_os = "linux"))]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
 fn rustdoc_target() {
     let p = project()
         .file("src/lib.rs", "")