]> git.lizzy.rs Git - rust.git/commitdiff
no need to do a no_std build for wasi
authorRalf Jung <post@ralfj.de>
Wed, 28 Dec 2022 16:49:03 +0000 (17:49 +0100)
committerRalf Jung <post@ralfj.de>
Wed, 28 Dec 2022 17:01:20 +0000 (18:01 +0100)
src/tools/miri/ci.sh
src/tools/miri/test_dependencies/Cargo.toml

index 3a79b10a56d34b35ca7392b69544764716fbefde..b35f7370d68a57743803d427aa2cd5e7841cdd29 100755 (executable)
@@ -108,7 +108,7 @@ case $HOST_TARGET in
     MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
     MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic data_race env/var
     MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec panic/panic
-    MIRI_TEST_TARGET=wasm32-wasi MIRI_NO_STD=1 run_tests_minimal no_std # supports std but miri doesn't support it
+    MIRI_TEST_TARGET=wasm32-wasi run_tests_minimal no_std integer
     MIRI_TEST_TARGET=thumbv7em-none-eabihf MIRI_NO_STD=1 run_tests_minimal no_std # no_std embedded architecture
     MIRI_TEST_TARGET=tests/avr.json MIRI_NO_STD=1 run_tests_minimal no_std # JSON target file
     ;;
index 3a80e8c96441962ad14ac09ada234f5413765bb5..1df35bbbe2f9510d00e7799fb5915775dc183203 100644 (file)
@@ -9,13 +9,15 @@ edition = "2021"
 
 [dependencies]
 # all dependencies (and their transitive ones) listed here can be used in `tests/`.
-tokio = { version = "1.0", features = ["full"] }
 libc = "0.2"
-page_size = "0.5"
 num_cpus = "1.10.1"
 
 getrandom_1 = { package = "getrandom", version = "0.1" }
 getrandom = { version = "0.2" }
 rand = { version = "0.8", features = ["small_rng"] }
 
+[target.'cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))'.dependencies]
+page_size = "0.5"
+tokio = { version = "1.0", features = ["full"] }
+
 [workspace]