commit ce2228777ebc45916749d49bce8cf28a5aba21a1
author Joel Galenson <jgalenson@google.com> Sat Oct 09 02:47:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 09 02:47:01 2021 +0000
tree 5bf328ca6dfa2265bb0607073a7d26d6cb71e932
parent de865518a3f1608a752171d9ea973188e397dfae
parent 9c1e81ef92e5b1e127aedb0f60c6e19ca7650215

Fix failing test am: 45b2647cce am: d1f68b5825 am: 5b09961b72 am: 9c1e81ef92

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-bigint/+/1851037

Change-Id: If1cfd8a0d42529ee8d65d58fe953d457b8b50d22

patches/disable_tests.patch

diff --git a/patches/should_panic.patch b/patches/disable_tests.patch
similarity index 87%
rename from patches/should_panic.patch
rename to patches/disable_tests.patch
index 52036ef..c08b7d9 100644
--- a/patches/should_panic.patch
+++ b/patches/disable_tests.patch
@@ -6,7 +6,7 @@
  }
  
  #[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();
@@ -18,7 +18,7 @@
  }
  
  #[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();

tests/bigint_scalar.rs

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 @@
 }
 
 #[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();

tests/biguint_scalar.rs

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 @@
 }
 
 #[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();