about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-19 05:12:51 -0700
committerGitHub <noreply@github.com>2016-07-19 05:12:51 -0700
commit27e766d7bc84be992c8ddef710affc92ef4a0adf (patch)
treef345cf9cdd68dfc339f34e09b7dd3229d1c7c825 /src/test
parent92400cf8dcf411ce7e70ab2960639977d46d5b01 (diff)
parent88b37b6d9cf8cbe12550c0ac5399e9cf08674ca9 (diff)
downloadrust-27e766d7bc84be992c8ddef710affc92ef4a0adf.tar.gz
rust-27e766d7bc84be992c8ddef710affc92ef4a0adf.zip
Auto merge of #34898 - sanxiyn:rollup, r=sanxiyn
Rollup of 5 pull requests

- Successful merges: #34807, #34853, #34875, #34884, #34889
- Failed merges:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/debuginfo/type-names.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/debuginfo/type-names.rs b/src/test/debuginfo/type-names.rs
index a74369ed3c3..2419625cbd3 100644
--- a/src/test/debuginfo/type-names.rs
+++ b/src/test/debuginfo/type-names.rs
@@ -11,6 +11,8 @@
 // ignore-tidy-linelength
 // ignore-lldb
 // ignore-android: FIXME(#24958)
+// ignore-arm: FIXME(#24958)
+// ignore-aarch64: FIXME(#24958)
 
 // compile-flags:-g