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

bors · bors · commit 67c4796dced3 · 2018-08-03T13:40:12.000Z
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
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", "")

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ fn features() {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`#[test]`
`184`		`-#[cfg(all(target_arch = "x86_64", target_os = "linux"))]`
	`184`	`+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]`
`185`	`185`	`fn rustdoc_target() {`
`186`	`186`	`let p = project()`
`187`	`187`	`.file("src/lib.rs", "")`