aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiƩbaud Weksteen <tweek@google.com>2021-01-27 14:07:09 +0100
committerThiƩbaud Weksteen <tweek@google.com>2021-01-27 14:17:55 +0100
commit80d30c6eaf70bcddf9167f1d4db1342442e0587a (patch)
tree7b285536286fd3c7d0fd3839171c68b5cec7573a
parent6c8867a1819a71d3681d549023d7e715a04d7f75 (diff)
downloadspin-80d30c6eaf70bcddf9167f1d4db1342442e0587a.tar.gz
Disable tests relying on unwinderplatform-tools-31.0.0
Some unit tests assume that an unwind will occur when panicking. Android uses the panic_abort strategy, the panic will not be caught. Bug: 178577888 Test: atest spin_device_test_src_lib Change-Id: If0165c086d926eb39d34dfa1d4bcf3d1a9ff4c5c
-rw-r--r--patches/disable_panic_tests.patch48
-rw-r--r--src/mutex/spin.rs1
-rw-r--r--src/mutex/ticket.rs1
-rw-r--r--src/once.rs1
-rw-r--r--src/rw_lock.rs1
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();