Skip to content

Commit a374d1c

Browse files
committed
update BASIC test list: no longer test HashMap, add libc-mem instead of 'align' for heap allocator coverage, move 'hello' to UNIX
HashMap now needs pretty target-specific randomness functions. It still works on Android, but not on FreeBSD and Solarish.
1 parent 60265e4 commit a374d1c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/tools/miri/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ degree documented below):
219219
- `solaris` / `illumos`: maintained by @devnexen. Supports `std::{env, thread, sync}`, but not `std::fs`.
220220
- `freebsd`: **maintainer wanted**. Supports `std::env` and parts of `std::{thread, fs}`, but not `std::sync`.
221221
- `android`: **maintainer wanted**. Support very incomplete, but a basic "hello world" works.
222-
- `wasm`: **maintainer wanted**. Support very incomplete, not even standard output works, but an empty `main` function works.
222+
- `wasi`: **maintainer wanted**. Support very incomplete, not even standard output works, but an empty `main` function works.
223223
- For targets on other operating systems, Miri might fail before even reaching the `main` function.
224224

225225
However, even for targets that we do support, the degree of support for accessing platform APIs

src/tools/miri/ci/ci.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ case $HOST_TARGET in
148148
TEST_TARGET=arm-unknown-linux-gnueabi run_tests
149149
TEST_TARGET=s390x-unknown-linux-gnu run_tests # big-endian architecture of choice
150150
# Partially supported targets (tier 2)
151-
BASIC="empty_main integer vec string btreemap hello hashmap heap_alloc align" # ensures we have the basics: stdout/stderr, system allocator, randomness (for HashMap initialization)
152-
UNIX="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
151+
BASIC="empty_main integer heap_alloc libc-mem vec string btreemap" # ensures we have the basics: pre-main code, system allocator
152+
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
153153
TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname pthread time fs
154154
TEST_TARGET=i686-unknown-freebsd run_tests_minimal $BASIC $UNIX threadname pthread time fs
155155
TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX thread sync available-parallelism time tls
156156
TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX thread sync available-parallelism time tls
157-
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX pthread --skip threadname --skip pthread_cond_timedwait
158-
TEST_TARGET=wasm32-wasip2 run_tests_minimal empty_main wasm heap_alloc libc-mem
159-
TEST_TARGET=wasm32-unknown-unknown run_tests_minimal empty_main wasm
157+
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX hashmap pthread --skip threadname --skip pthread_cond_timedwait
158+
TEST_TARGET=wasm32-wasip2 run_tests_minimal $BASIC wasm
159+
TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std empty_main wasm # this target doesn't really have std
160160
TEST_TARGET=thumbv7em-none-eabihf run_tests_minimal no_std
161161
# Custom target JSON file
162162
TEST_TARGET=tests/avr.json MIRI_NO_STD=1 run_tests_minimal no_std

0 commit comments

Comments
 (0)