diff options
| author | Chris Wailes <chriswailes@google.com> | 2023-01-20 01:28:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-20 01:28:28 +0000 |
| commit | 34e4fc222fb184a8f0bef5450a62fd7259041a5f (patch) | |
| tree | f178981911468d21f90fea457b6c0c617fc4482d | |
| parent | df1991fbab0dc565a90379c51009401a6daf6917 (diff) | |
| parent | b77bcd7e741c0a79d7b367e1bc3f16b907263ed4 (diff) | |
| download | tokio-34e4fc222fb184a8f0bef5450a62fd7259041a5f.tar.gz | |
Disable unwinding tests when using panic-abort am: b77bcd7e74
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/2393425
Change-Id: I8bd321138c67f4f904eae42b4986d71b9734c870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/panic_unwind_tests.patch | 24 | ||||
| -rw-r--r-- | tests/sync_broadcast.rs | 1 | ||||
| -rw-r--r-- | tests/sync_watch.rs | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/patches/panic_unwind_tests.patch b/patches/panic_unwind_tests.patch new file mode 100644 index 0000000..adf431e --- /dev/null +++ b/patches/panic_unwind_tests.patch @@ -0,0 +1,24 @@ +diff --git a/tests/sync_broadcast.rs b/tests/sync_broadcast.rs +index 9aa3484..53ee7d8 100644 +--- a/tests/sync_broadcast.rs ++++ b/tests/sync_broadcast.rs +@@ -292,6 +292,7 @@ fn capacity_too_big() { + + #[test] ++#[cfg(panic = "unwind")] + #[cfg(not(tokio_wasm))] // wasm currently doesn't support unwinding + fn panic_in_clone() { + use std::panic::{self, AssertUnwindSafe}; + +diff --git a/tests/sync_watch.rs b/tests/sync_watch.rs +index 34f9b78..e8eacce 100644 +--- a/tests/sync_watch.rs ++++ b/tests/sync_watch.rs +@@ -214,6 +214,7 @@ fn reopened_after_subscribe() { + + #[test] ++#[cfg(panic = "unwind")] + #[cfg(not(tokio_wasm))] // wasm currently doesn't support unwinding + fn send_modify_panic() { + let (tx, mut rx) = watch::channel("one"); + diff --git a/tests/sync_broadcast.rs b/tests/sync_broadcast.rs index 9aa3484..2221fe3 100644 --- a/tests/sync_broadcast.rs +++ b/tests/sync_broadcast.rs @@ -291,6 +291,7 @@ fn capacity_too_big() { } #[test] +#[cfg(panic = "unwind")] #[cfg(not(tokio_wasm))] // wasm currently doesn't support unwinding fn panic_in_clone() { use std::panic::{self, AssertUnwindSafe}; diff --git a/tests/sync_watch.rs b/tests/sync_watch.rs index 34f9b78..d4f8ce8 100644 --- a/tests/sync_watch.rs +++ b/tests/sync_watch.rs @@ -213,6 +213,7 @@ fn reopened_after_subscribe() { } #[test] +#[cfg(panic = "unwind")] #[cfg(not(tokio_wasm))] // wasm currently doesn't support unwinding fn send_modify_panic() { let (tx, mut rx) = watch::channel("one"); |