Skip to content

Commit f72a28c

Browse files
Auto merge of #147100 - Enselic:ignore-less, r=<try>
tests: Remove ignore-android directive for fixed issue try-job: arm-android
2 parents f957826 + 6233cc0 commit f72a28c

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

src/ci/docker/host-x86_64/arm-android/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ENV TARGETS=arm-linux-androideabi
3434

3535
ENV RUST_CONFIGURE_ARGS --android-ndk=/android/ndk/
3636

37-
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
37+
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS tests/ui/test-attrs/test-panic-abort.rs tests/ui/test-attrs/test-panic-abort-nocapture.rs
3838

3939
COPY scripts/sccache.sh /scripts/
4040
RUN sh /scripts/sccache.sh

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)