diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2021-01-27 16:47:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 16:47:52 +0000 |
| commit | 324c1d6b041b0c9dd9331752944af89560aee55a (patch) | |
| tree | 7b285536286fd3c7d0fd3839171c68b5cec7573a | |
| parent | a65efe206fc824d6f80aca5b39202dc35eb7a329 (diff) | |
| parent | 19a987a12ab27ffe6f687193a59ddecf69728ea1 (diff) | |
| download | spin-324c1d6b041b0c9dd9331752944af89560aee55a.tar.gz | |
Disable tests relying on unwinder am: 80d30c6eaf am: b8bd545785 am: 19a987a12a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/1561877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib58c55e6ada10dc1ad9db2284efd3d24d80bb507
| -rw-r--r-- | patches/disable_panic_tests.patch | 48 | ||||
| -rw-r--r-- | src/mutex/spin.rs | 1 | ||||
| -rw-r--r-- | src/mutex/ticket.rs | 1 | ||||
| -rw-r--r-- | src/once.rs | 1 | ||||
| -rw-r--r-- | src/rw_lock.rs | 1 |
5 files changed, 52 insertions, 0 deletions
diff --git a/patches/disable_panic_tests.patch b/patches/disable_panic_tests.patch new file mode 100644 index 0000000..658ee32 --- /dev/null +++ b/patches/disable_panic_tests.patch @@ -0,0 +1,48 @@ +diff --git a/src/mutex/spin.rs b/src/mutex/spin.rs +index 60be1e8..36d65fd 100644 +--- a/src/mutex/spin.rs ++++ b/src/mutex/spin.rs +@@ -432,6 +432,7 @@ mod tests { + } + + #[test] ++ #[ignore = "Android uses panic_abort"] + fn test_mutex_arc_access_in_unwind() { + let arc = Arc::new(SpinMutex::new(1)); + let arc2 = arc.clone(); +diff --git a/src/mutex/ticket.rs b/src/mutex/ticket.rs +index df36e95..4186fb8 100644 +--- a/src/mutex/ticket.rs ++++ b/src/mutex/ticket.rs +@@ -428,6 +428,7 @@ mod tests { + } + + #[test] ++ #[ignore = "Android uses panic_abort"] + fn test_mutex_arc_access_in_unwind() { + let arc = Arc::new(TicketMutex::new(1)); + let arc2 = arc.clone(); +diff --git a/src/once.rs b/src/once.rs +index 5d4b451..ad60405 100644 +--- a/src/once.rs ++++ b/src/once.rs +@@ -384,6 +384,7 @@ mod tests { + } + + #[test] ++ #[ignore = "Android uses panic_abort"] + fn panic() { + use ::std::panic; + +diff --git a/src/rw_lock.rs b/src/rw_lock.rs +index 5c009cf..ed50407 100644 +--- a/src/rw_lock.rs ++++ b/src/rw_lock.rs +@@ -932,6 +932,7 @@ mod tests { + } + + #[test] ++ #[ignore = "Android uses panic_abort"] + fn test_rw_access_in_unwind() { + let arc = Arc::new(RwLock::new(1)); + let arc2 = arc.clone(); diff --git a/src/mutex/spin.rs b/src/mutex/spin.rs index 60be1e8..36d65fd 100644 --- a/src/mutex/spin.rs +++ b/src/mutex/spin.rs @@ -432,6 +432,7 @@ mod tests { } #[test] + #[ignore = "Android uses panic_abort"] fn test_mutex_arc_access_in_unwind() { let arc = Arc::new(SpinMutex::new(1)); let arc2 = arc.clone(); diff --git a/src/mutex/ticket.rs b/src/mutex/ticket.rs index df36e95..4186fb8 100644 --- a/src/mutex/ticket.rs +++ b/src/mutex/ticket.rs @@ -428,6 +428,7 @@ mod tests { } #[test] + #[ignore = "Android uses panic_abort"] fn test_mutex_arc_access_in_unwind() { let arc = Arc::new(TicketMutex::new(1)); let arc2 = arc.clone(); diff --git a/src/once.rs b/src/once.rs index 5d4b451..ad60405 100644 --- a/src/once.rs +++ b/src/once.rs @@ -384,6 +384,7 @@ mod tests { } #[test] + #[ignore = "Android uses panic_abort"] fn panic() { use ::std::panic; diff --git a/src/rw_lock.rs b/src/rw_lock.rs index 5c009cf..ed50407 100644 --- a/src/rw_lock.rs +++ b/src/rw_lock.rs @@ -932,6 +932,7 @@ mod tests { } #[test] + #[ignore = "Android uses panic_abort"] fn test_rw_access_in_unwind() { let arc = Arc::new(RwLock::new(1)); let arc2 = arc.clone(); |