Skip to content

Commit d9e3e19

Browse files
authored
Rollup merge of #147100 - Enselic:ignore-less, r=jieyouxu
tests: Remove ignore-android directive for fixed issue #120567 is marked as fixed, so let's see if we can remove the ignore directives tied to that issue. <!-- Note to self: wait for rust-lang/team#2002 --> try-job: arm-android
2 parents 772f380 + fa53de6 commit d9e3e19

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

tests/ui/test-attrs/test-panic-abort-nocapture.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//@ exec-env:RUST_BACKTRACE=0
77
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

9-
//@ ignore-android #120567
109
//@ needs-subprocess
1110

1211
#![cfg(test)]

tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:32:5:
2+
thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:31:5:
33
assertion `left == right` failed
44
left: 2
55
right: 4
66
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
77

8-
thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:26:5:
8+
thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:25:5:
99
assertion `left == right` failed
1010
left: 2
1111
right: 4

tests/ui/test-attrs/test-panic-abort.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//@ exec-env:RUST_BACKTRACE=0
77
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

9-
//@ ignore-android #120567
109
//@ needs-subprocess
1110

1211
#![cfg(test)]

tests/ui/test-attrs/test-panic-abort.run.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ testing123
1818
---- it_fails stderr ----
1919
testing321
2020

21-
thread 'main' ($TID) panicked at $DIR/test-panic-abort.rs:37:5:
21+
thread 'main' ($TID) panicked at $DIR/test-panic-abort.rs:36:5:
2222
assertion `left == right` failed
2323
left: 2
2424
right: 5

0 commit comments

Comments
 (0)