about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-04 21:01:14 +0000
committerbors <bors@rust-lang.org>2016-03-04 21:01:14 +0000
commitda0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b (patch)
tree1cabc62db300d796a2f0791375995a3c23ff67a1 /src/test
parentd31d8a9a919b705fb8d22ba99a693d9f96b8bdd5 (diff)
parentd5aeb769e998ed40a0dc935a0648f9bf1bd4292e (diff)
downloadrust-da0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b.tar.gz
rust-da0ccd8cc98b5a4f2edcaf1e4f67738f720bc86b.zip
Auto merge of #32046 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #32002, #32017, #32027, #32035, #32036
- Failed merges:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/issue-27362.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/rustdoc/issue-27362.rs b/src/test/rustdoc/issue-27362.rs
index 179778fd128..b28fb7ec47a 100644
--- a/src/test/rustdoc/issue-27362.rs
+++ b/src/test/rustdoc/issue-27362.rs
@@ -10,6 +10,7 @@
 
 // aux-build:issue-27362.rs
 // ignore-cross-compile
+// ignore-test This test fails on beta/stable #32019
 
 extern crate issue_27362;
 pub use issue_27362 as quux;