Skip to content

Commit 582eddc

Browse files
committed
fix previously dead android tests and remove some dangling files
1 parent 05cc3e4 commit 582eddc

10 files changed

+6
-215
lines changed

ci/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ case $HOST_TARGET in
152152
# Partially supported targets (tier 2)
153153
BASIC="empty_main integer heap_alloc libc-mem vec string btreemap" # ensures we have the basics: pre-main code, system allocator
154154
UNIX="hello panic/panic panic/unwind concurrency/simple atomic libc-mem libc-misc libc-random env num_cpus" # the things that are very similar across all Unixes, and hence easily supported there
155-
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX time hashmap random thread sync concurrency epoll eventfd
155+
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX time hashmap random thread sync concurrency epoll eventfd prctl
156156
TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std empty_main wasm # this target doesn't really have std
157157
TEST_TARGET=thumbv7em-none-eabihf run_tests_minimal no_std
158158
;;

tests/fail-dep/libc/prctl-get-name-buffer-too-small.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
fn main() {
66
let mut buf = vec![0u8; 15];
77
unsafe {
8-
libc::prctl(libc::PR_GET_NAME, buf.as_mut_ptr().cast::<libc::c_char>()); //~ ERROR: memory access failed: expected a pointer to 16 bytes of memory, but got alloc952 which is only 15 bytes from the end of the allocation
8+
libc::prctl(libc::PR_GET_NAME, buf.as_mut_ptr().cast::<libc::c_char>()); //~ ERROR: memory access failed
99
}
1010
}

tests/fail-dep/libc/prctl-get-name-buffer-too-small.stderr

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
error: Undefined Behavior: memory access failed: expected a pointer to 16 bytes of memory, but got ALLOC which is only 15 bytes from the end of the allocation
2-
--> tests/fail-dep/libc/prctl-threadname.rs:LL:CC
1+
error: Undefined Behavior: memory access failed: attempting to access 16 bytes, but got ALLOC which is only 15 bytes from the end of the allocation
2+
--> tests/fail-dep/libc/prctl-get-name-buffer-too-small.rs:LL:CC
33
|
44
LL | libc::prctl(libc::PR_GET_NAME, buf.as_mut_ptr().cast::<libc::c_char>());
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: expected a pointer to 16 bytes of memory, but got ALLOC which is only 15 bytes from the end of the allocation
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
help: ALLOC was allocated here:
10-
--> tests/fail-dep/libc/prctl-threadname.rs:LL:CC
10+
--> tests/fail-dep/libc/prctl-get-name-buffer-too-small.rs:LL:CC
1111
|
1212
LL | let mut buf = vec![0u8; 15];
1313
| ^^^^^^^^^^^^^
14-
= note: BACKTRACE (of the first span):
15-
= note: inside `main` at tests/fail-dep/libc/prctl-threadname.rs:LL:CC
1614
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
1715

1816
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

tests/fail-dep/libc/socketpair_read_blocking.stderr

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/fail-dep/libc/socketpair_write_blocking.stderr

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/fail/data_race/mixed_size_write_write.stderr

Lines changed: 0 additions & 22 deletions
This file was deleted.

tests/fail/stacked_borrows/retag_data_race_read.stack.stderr

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/fail/stacked_borrows/retag_data_race_read.tree.stderr

Lines changed: 0 additions & 26 deletions
This file was deleted.

tests/pass/ptr_int_casts.tree.stderr

Lines changed: 0 additions & 89 deletions
This file was deleted.

tests/pass/ptr_int_from_exposed.tree.stderr

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)