diff options
| author | bors <bors@rust-lang.org> | 2024-05-19 14:51:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-19 14:51:12 +0000 |
| commit | f7520e40f72c002a6dcf70db7a7d7d0e74549af6 (patch) | |
| tree | 791a15647be8bc25d9447bd46c9e6713862c3806 | |
| parent | 3c15681a480c7092794430f51f3acae190678aff (diff) | |
| parent | b8a7c7379283c4d6078871f9024b820642c88856 (diff) | |
| download | rust-f7520e40f72c002a6dcf70db7a7d7d0e74549af6.tar.gz rust-f7520e40f72c002a6dcf70db7a7d7d0e74549af6.zip | |
Auto merge of #3620 - RalfJung:wasi, r=RalfJung
test wasm32-wasip2 instead of the deprecated wasm32-wasi target
| -rwxr-xr-x | src/tools/miri/ci/ci.sh | 2 | ||||
| -rw-r--r-- | src/tools/miri/test_dependencies/Cargo.toml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/ci/ci.sh b/src/tools/miri/ci/ci.sh index 50ac4539c26..9480663a01d 100755 --- a/src/tools/miri/ci/ci.sh +++ b/src/tools/miri/ci/ci.sh @@ -151,7 +151,7 @@ case $HOST_TARGET in TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX pthread-sync TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX pthread-sync TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX - TEST_TARGET=wasm32-wasi run_tests_minimal empty_main wasm heap_alloc libc-mem + TEST_TARGET=wasm32-wasip2 run_tests_minimal empty_main wasm heap_alloc libc-mem TEST_TARGET=wasm32-unknown-unknown run_tests_minimal empty_main wasm TEST_TARGET=thumbv7em-none-eabihf run_tests_minimal no_std # Custom target JSON file diff --git a/src/tools/miri/test_dependencies/Cargo.toml b/src/tools/miri/test_dependencies/Cargo.toml index 1894f53ce49..e40dd50a444 100644 --- a/src/tools/miri/test_dependencies/Cargo.toml +++ b/src/tools/miri/test_dependencies/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" # all dependencies (and their transitive ones) listed here can be used in `tests/`. libc = "0.2" num_cpus = "1.10.1" -tempfile = "3" getrandom_01 = { package = "getrandom", version = "0.1" } getrandom_02 = { package = "getrandom", version = "0.2", features = ["js"] } [target.'cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))'.dependencies] +tempfile = "3" page_size = "0.6" tokio = { version = "1.24", features = ["macros", "rt-multi-thread", "time", "net"] } |