Navigation Menu

Skip to content

Commit

Permalink
Auto merge of #23695 - sae-bom:mac-android-debuginfo, r=alexcrichton
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Mar 25, 2015
2 parents a3b1361 + c66a2b7 commit 2790184
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions mk/tests.mk
Expand Up @@ -569,6 +569,11 @@ ifeq ($(CFG_OSTYPE),apple-darwin)
CTEST_DISABLE_debuginfo-gdb = "gdb on darwin needs root"
endif

ifeq ($(findstring android, $(CFG_TARGET)), android)
CTEST_DISABLE_debuginfo-gdb =
CTEST_DISABLE_debuginfo-lldb = "lldb tests are disabled on android"
endif

# CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP), if set, will cause that
# test group to be disabled *unless* the target is able to build a
# compiler (i.e. when the target triple is in the set of of host
Expand Down
1 change: 1 addition & 0 deletions src/libstd/process.rs
Expand Up @@ -748,6 +748,7 @@ mod tests {
cmd
}

#[cfg(not(target_arch = "aarch64"))]
#[test]
fn test_keep_current_working_dir() {
use os;
Expand Down
1 change: 1 addition & 0 deletions src/test/debuginfo/c-style-enum.rs
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/test/debuginfo/issue12886.rs
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/sigpipe-should-be-ignored.rs
Expand Up @@ -11,6 +11,7 @@
// Be sure that when a SIGPIPE would have been received that the entire process
// doesn't die in a ball of fire, but rather it's gracefully handled.

// ignore-aarch64
// pretty-expanded FIXME #23616

use std::env;
Expand Down

0 comments on commit 2790184

Please sign in to comment.