about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-16 00:31:15 +0000
committerbors <bors@rust-lang.org>2014-07-16 00:31:15 +0000
commitafbcbbc77ffc6b10053bc543daf7d2e05d68cc01 (patch)
treee464c05b2819fad49471326c25e6c97413538dc8 /src
parent2692ae1ddde62a3fc01d58220656c5ae32605959 (diff)
parentd2a08e9011582e06db287dbe9d2a1a71cc99d625 (diff)
downloadrust-afbcbbc77ffc6b10053bc543daf7d2e05d68cc01.tar.gz
rust-afbcbbc77ffc6b10053bc543daf7d2e05d68cc01.zip
auto merge of #15695 : alexcrichton/rust/fix-snapshots, r=brson
This test seems to yield a different error message on cross compiles, so just
ignore it when cross compiling.
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail-fulldeps/macro-crate-rlib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs
index 625245d9f2d..d4f286f20e8 100644
--- a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs
+++ b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs
@@ -12,6 +12,7 @@
 // ignore-stage1
 // ignore-tidy-linelength
 // ignore-android
+// ignore-cross-compile gives a different error message
 
 #![feature(phase)]
 #[phase(plugin)] extern crate rlib_crate_test;