diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2021-01-27 18:41:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 18:41:25 +0000 |
| commit | 99c22a292c742af3c5db50ef697898a3fd601344 (patch) | |
| tree | e7781468032546c891baf989e89e71b6616415c9 | |
| parent | 4f49fc21c6420e8f0dc63bd91cd121b714952b31 (diff) | |
| parent | 2635ad08e487b2528509033bc7f93406f94d1234 (diff) | |
| download | scopeguard-99c22a292c742af3c5db50ef697898a3fd601344.tar.gz | |
Disable tests relying on unwinder am: e2b28ae283 am: 64b3e7c12f am: 8f3a39067c am: 0af5ace053 am: 2635ad08e4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1561915
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4950ca2064f8a345298258f8afd5a8db9541890
| -rw-r--r-- | patches/disable_panic_tests.patch | 20 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/patches/disable_panic_tests.patch b/patches/disable_panic_tests.patch new file mode 100644 index 0000000..97615cd --- /dev/null +++ b/patches/disable_panic_tests.patch @@ -0,0 +1,20 @@ +diff --git a/src/lib.rs b/src/lib.rs +index d33c2b6..39f5026 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -500,6 +500,7 @@ mod tests { + + #[cfg(feature = "use_std")] + #[test] ++ #[ignore = "Android uses panic_abort"] + fn test_defer_success_2() { + let drops = Cell::new(0); + let _ = catch_unwind(AssertUnwindSafe(|| { +@@ -511,6 +512,7 @@ mod tests { + + #[cfg(feature = "use_std")] + #[test] ++ #[ignore = "Android uses panic_abort"] + fn test_defer_unwind_1() { + let drops = Cell::new(0); + let _ = catch_unwind(AssertUnwindSafe(|| { @@ -500,6 +500,7 @@ mod tests { #[cfg(feature = "use_std")] #[test] + #[ignore = "Android uses panic_abort"] fn test_defer_success_2() { let drops = Cell::new(0); let _ = catch_unwind(AssertUnwindSafe(|| { @@ -511,6 +512,7 @@ mod tests { #[cfg(feature = "use_std")] #[test] + #[ignore = "Android uses panic_abort"] fn test_defer_unwind_1() { let drops = Cell::new(0); let _ = catch_unwind(AssertUnwindSafe(|| { |