Skip to content

Commit e0abdd2

Browse files
Auto merge of #147091 - Enselic:android-bt, r=<try>
tests: Stop ignoring android in backtrace tests try-job: arm-android
2 parents ade8487 + f314a51 commit e0abdd2

13 files changed

+5
-14
lines changed

tests/ui/backtrace/backtrace.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ run-pass
2-
//@ ignore-android FIXME #17520
32
//@ needs-subprocess
43
//@ ignore-openbsd no support for libbacktrace without filename
54
//@ ignore-msvc see #62897 and `backtrace-debuginfo.rs` test

tests/ui/backtrace/dylib-dep.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// Original test:
55
// <https://github.com/rust-lang/backtrace-rs/tree/6fa4b85b9962c3e1be8c2e5cc605cd078134152b/crates/dylib-dep>
66
// ignore-tidy-linelength
7-
//@ ignore-android FIXME #17520
87
//@ ignore-fuchsia Backtraces not symbolized
98
//@ ignore-musl musl doesn't support dynamic libraries (at least when the original test was written).
109
//@ ignore-ios needs the `.dSYM` files to be moved to the device

tests/ui/backtrace/line-tables-only.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// ignore-tidy-linelength
99
//@ run-pass
1010
//@ compile-flags: -Cstrip=none -Cdebuginfo=line-tables-only
11-
//@ ignore-android FIXME #17520
1211
//@ ignore-fuchsia Backtraces not symbolized
1312
//@ ignore-emscripten Requires custom symbolization code
1413
//@ ignore-ios needs the `.dSYM` files to be moved to the device

tests/ui/backtrace/std-backtrace.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ run-pass
2-
//@ ignore-android FIXME #17520
32
//@ needs-subprocess
43
//@ ignore-openbsd no support for libbacktrace without filename
54
//@ ignore-fuchsia Backtraces not symbolized

tests/ui/panics/issue-47429-short-backtraces.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
//@ normalize-stderr: "\n +at [^\n]+" -> ""
1919

2020
//@ ignore-msvc see #62897 and `backtrace-debuginfo.rs` test
21-
//@ ignore-android FIXME #17520
2221
//@ ignore-openbsd no support for libbacktrace without filename
2322
//@ ignore-fuchsia Backtraces not symbolized
2423
//@ needs-subprocess

tests/ui/panics/issue-47429-short-backtraces.run.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
thread 'main' ($TID) panicked at $DIR/issue-47429-short-backtraces.rs:27:5:
2+
thread 'main' ($TID) panicked at $DIR/issue-47429-short-backtraces.rs:26:5:
33
explicit panic
44
stack backtrace:
55
0: std::panicking::begin_panic

tests/ui/panics/location-detail-unwrap-multiline.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//@ run-fail
22
//@ compile-flags: -Cstrip=none -Cdebuginfo=line-tables-only -Copt-level=0
33
//@ exec-env:RUST_BACKTRACE=1
4-
//@ regex-error-pattern: location-detail-unwrap-multiline\.rs:11(:10)?:\n
4+
//@ regex-error-pattern: location-detail-unwrap-multiline\.rs:10(:10)?:\n
55
//@ needs-unwind
6-
//@ ignore-android FIXME #17520
76

87
fn main() {
98
let opt: Option<u32> = None;

tests/ui/panics/runtime-switch.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
//@ normalize-stderr: "\n +at [^\n]+" -> ""
1919

2020
//@ ignore-msvc see #62897 and `backtrace-debuginfo.rs` test
21-
//@ ignore-android FIXME #17520
2221
//@ ignore-openbsd no support for libbacktrace without filename
2322
//@ ignore-wasm no backtrace support
2423
//@ ignore-fuchsia Backtrace not symbolized

tests/ui/panics/runtime-switch.run.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
thread 'main' ($TID) panicked at $DIR/runtime-switch.rs:31:5:
2+
thread 'main' ($TID) panicked at $DIR/runtime-switch.rs:30:5:
33
explicit panic
44
stack backtrace:
55
0: std::panicking::begin_panic

tests/ui/panics/short-ice-remove-middle-frames-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//@ check-run-results
44
//@ exec-env:RUST_BACKTRACE=1
55
//@ needs-unwind
6-
//@ ignore-android FIXME #17520
76
//@ ignore-openbsd no support for libbacktrace without filename
87
//@ ignore-sgx Backtraces not symbolized
98
//@ ignore-fuchsia Backtraces not symbolized

0 commit comments

Comments
 (0)