diff options
| author | bors <bors@rust-lang.org> | 2015-03-25 21:29:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-25 21:29:50 +0000 |
| commit | 27901849e07558639b8decc03707e0317ae8280e (patch) | |
| tree | 74163d4fe4b8dc8d26df2c0336f4be98d060ad32 /src/test/debuginfo | |
| parent | a3b13610c5b93d9ada072471a001a5613df6a960 (diff) | |
| parent | c66a2b7393afe332ee8bf6aba985e4fdd253cf54 (diff) | |
| download | rust-27901849e07558639b8decc03707e0317ae8280e.tar.gz rust-27901849e07558639b8decc03707e0317ae8280e.zip | |
Auto merge of #23695 - sae-bom:mac-android-debuginfo, r=alexcrichton
1. when mac-android cross compile and make-check , make it use gdb instead of lldb so as to it passes debuginfo tests. 2. ignore some tests on aarch64
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/c-style-enum.rs | 1 | ||||
| -rw-r--r-- | src/test/debuginfo/issue12886.rs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/debuginfo/c-style-enum.rs b/src/test/debuginfo/c-style-enum.rs index 2305d7bc5c2..766105881ce 100644 --- a/src/test/debuginfo/c-style-enum.rs +++ b/src/test/debuginfo/c-style-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-aarch64 // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/issue12886.rs b/src/test/debuginfo/issue12886.rs index 424ba50e3c9..3c2e7f10d16 100644 --- a/src/test/debuginfo/issue12886.rs +++ b/src/test/debuginfo/issue12886.rs @@ -10,12 +10,13 @@ // ignore-windows failing on 64-bit bots FIXME #17638 // ignore-lldb +// ignore-aarch64 // compile-flags:-g // gdb-command:run // gdb-command:next -// gdb-check:[...]33[...]s +// gdb-check:[...]34[...]s // gdb-command:continue #![omit_gdb_pretty_printer_section] |