From eb805b90046b7e302c1c609db2902a3a727da0f6 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 17 Aug 2023 11:20:52 +0200 Subject: [PATCH] Test virtual-net bincode and mpsc only on linux (#4152) * Test virtual-net bincode and mpsc only on linux * Disable check_small_stack check on macos/aarch64 (different pagesize, test won't work there) * Diabled all remaining tests of virtual-net on macOS * Diabled other virtual-net tests for windows too --- lib/api/src/sys/tunables.rs | 8 +++++++- lib/virtual-net/src/tests.rs | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/api/src/sys/tunables.rs b/lib/api/src/sys/tunables.rs index 7aa5316c85f..c2853be44ff 100644 --- a/lib/api/src/sys/tunables.rs +++ b/lib/api/src/sys/tunables.rs @@ -279,7 +279,13 @@ mod tests { } #[test] - #[cfg(all(feature = "singlepass", not(target_os = "windows")))] + #[cfg(all( + feature = "singlepass", + not(any( + target_os = "windows", + all(target_os = "macos", target_arch = "aarch64") + )) + ))] fn check_small_stack() -> Result<(), Box> { use crate::{imports, wat2wasm, Engine, Instance, Module, Store}; use wasmer_compiler_singlepass::Singlepass; diff --git a/lib/virtual-net/src/tests.rs b/lib/virtual-net/src/tests.rs index dec3f97904e..7a59a6988fd 100644 --- a/lib/virtual-net/src/tests.rs +++ b/lib/virtual-net/src/tests.rs @@ -125,6 +125,7 @@ async fn test_tcp(client: RemoteNetworkingClient, _server: RemoteNetworkingServe } #[cfg(feature = "remote")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_mpsc() { @@ -133,6 +134,7 @@ async fn test_tcp_with_mpsc() { } #[cfg(feature = "remote")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_small_pipe_using_bincode() { @@ -141,6 +143,7 @@ async fn test_tcp_with_small_pipe_using_bincode() { } #[cfg(feature = "remote")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_large_pipe_using_bincode() { @@ -150,6 +153,7 @@ async fn test_tcp_with_large_pipe_using_bincode() { #[cfg(feature = "remote")] #[cfg(feature = "json")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_small_pipe_using_json() { @@ -159,6 +163,7 @@ async fn test_tcp_with_small_pipe_using_json() { #[cfg(feature = "remote")] #[cfg(feature = "json")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_large_pipe_json_using_json() { @@ -168,6 +173,7 @@ async fn test_tcp_with_large_pipe_json_using_json() { #[cfg(feature = "remote")] #[cfg(feature = "messagepack")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_small_pipe_using_messagepack() { @@ -177,6 +183,7 @@ async fn test_tcp_with_small_pipe_using_messagepack() { #[cfg(feature = "remote")] #[cfg(feature = "messagepack")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_large_pipe_json_using_messagepack() { @@ -186,6 +193,7 @@ async fn test_tcp_with_large_pipe_json_using_messagepack() { #[cfg(feature = "remote")] #[cfg(feature = "cbor")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_small_pipe_using_cbor() { @@ -195,6 +203,7 @@ async fn test_tcp_with_small_pipe_using_cbor() { #[cfg(feature = "remote")] #[cfg(feature = "cbor")] +#[cfg(target_os = "linux")] #[traced_test] #[tokio::test] async fn test_tcp_with_large_pipe_json_using_cbor() {