From 45b2647cce025e868a5352d42dac584aa74903b4 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Fri, 8 Oct 2021 16:18:49 -0700
Subject: Fix failing test

Fixes: 202560360
Test: atest num-bigint_host_test_tests_biguint_scalar
Change-Id: Ia1d9c87e99a17f1ac65ccb5e5eb573ca0c91a19c
---
 patches/disable_tests.patch | 24 ++++++++++++++++++++++++
 patches/should_panic.patch  | 24 ------------------------
 tests/bigint_scalar.rs      |  2 +-
 tests/biguint_scalar.rs     |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 patches/disable_tests.patch
 delete mode 100644 patches/should_panic.patch

diff --git a/patches/disable_tests.patch b/patches/disable_tests.patch
new file mode 100644
index 0000000..c08b7d9
--- /dev/null
+++ b/patches/disable_tests.patch
@@ -0,0 +1,24 @@
+diff --git a/tests/bigint_scalar.rs b/tests/bigint_scalar.rs
+index 2a19faf..a4348f4 100644
+--- a/tests/bigint_scalar.rs
++++ b/tests/bigint_scalar.rs
+@@ -149,6 +149,7 @@ fn test_scalar_div_rem() {
+ }
+ 
+ #[test]
++#[ignore = "Android sometimes uses panic_abort"]
+ fn test_scalar_div_rem_zero() {
+     catch_unwind(|| BigInt::zero() / 0u32).unwrap_err();
+     catch_unwind(|| BigInt::zero() % 0u32).unwrap_err();
+diff --git a/tests/biguint_scalar.rs b/tests/biguint_scalar.rs
+index 7c34f7e..5b9f3ea 100644
+--- a/tests/biguint_scalar.rs
++++ b/tests/biguint_scalar.rs
+@@ -115,6 +115,7 @@ fn test_scalar_div_rem() {
+ }
+ 
+ #[test]
++#[ignore = "Android sometimes uses panic_abort"]
+ fn test_scalar_div_rem_zero() {
+     catch_unwind(|| BigUint::zero() / 0u32).unwrap_err();
+     catch_unwind(|| BigUint::zero() % 0u32).unwrap_err();
diff --git a/patches/should_panic.patch b/patches/should_panic.patch
deleted file mode 100644
index 52036ef..0000000
--- a/patches/should_panic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/tests/bigint_scalar.rs b/tests/bigint_scalar.rs
-index 2a19faf..a4348f4 100644
---- a/tests/bigint_scalar.rs
-+++ b/tests/bigint_scalar.rs
-@@ -149,6 +149,7 @@ fn test_scalar_div_rem() {
- }
- 
- #[test]
-+#[should_panic]
- fn test_scalar_div_rem_zero() {
-     catch_unwind(|| BigInt::zero() / 0u32).unwrap_err();
-     catch_unwind(|| BigInt::zero() % 0u32).unwrap_err();
-diff --git a/tests/biguint_scalar.rs b/tests/biguint_scalar.rs
-index 7c34f7e..5b9f3ea 100644
---- a/tests/biguint_scalar.rs
-+++ b/tests/biguint_scalar.rs
-@@ -115,6 +115,7 @@ fn test_scalar_div_rem() {
- }
- 
- #[test]
-+#[should_panic]
- fn test_scalar_div_rem_zero() {
-     catch_unwind(|| BigUint::zero() / 0u32).unwrap_err();
-     catch_unwind(|| BigUint::zero() % 0u32).unwrap_err();
diff --git a/tests/bigint_scalar.rs b/tests/bigint_scalar.rs
index a4348f4..10cf8d6 100644
--- a/tests/bigint_scalar.rs
+++ b/tests/bigint_scalar.rs
@@ -149,7 +149,7 @@ fn test_scalar_div_rem() {
 }
 
 #[test]
-#[should_panic]
+#[ignore = "Android sometimes uses panic_abort"]
 fn test_scalar_div_rem_zero() {
     catch_unwind(|| BigInt::zero() / 0u32).unwrap_err();
     catch_unwind(|| BigInt::zero() % 0u32).unwrap_err();
diff --git a/tests/biguint_scalar.rs b/tests/biguint_scalar.rs
index 5b9f3ea..114bbc6 100644
--- a/tests/biguint_scalar.rs
+++ b/tests/biguint_scalar.rs
@@ -115,7 +115,7 @@ fn test_scalar_div_rem() {
 }
 
 #[test]
-#[should_panic]
+#[ignore = "Android sometimes uses panic_abort"]
 fn test_scalar_div_rem_zero() {
     catch_unwind(|| BigUint::zero() / 0u32).unwrap_err();
     catch_unwind(|| BigUint::zero() % 0u32).unwrap_err();
-- 
cgit v1.2.3