diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-10-09 02:32:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-09 02:32:13 +0000 |
| commit | 9c1e81ef92e5b1e127aedb0f60c6e19ca7650215 (patch) | |
| tree | 5bf328ca6dfa2265bb0607073a7d26d6cb71e932 | |
| parent | 3ad7f7a20e2bdfb28cacbc22c50ba8c2724a9f67 (diff) | |
| parent | 5b09961b720ce2321bbf67923a0034eea59d9c4f (diff) | |
| download | num-bigint-9c1e81ef92e5b1e127aedb0f60c6e19ca7650215.tar.gz | |
Fix failing test am: 45b2647cce am: d1f68b5825 am: 5b09961b72
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-bigint/+/1851037
Change-Id: Ib07ace40ab4d1f8f1fd9e71b0cc0521cd912744a
| -rw-r--r-- | patches/disable_tests.patch (renamed from patches/should_panic.patch) | 4 | ||||
| -rw-r--r-- | tests/bigint_scalar.rs | 2 | ||||
| -rw-r--r-- | tests/biguint_scalar.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/should_panic.patch b/patches/disable_tests.patch index 52036ef..c08b7d9 100644 --- a/patches/should_panic.patch +++ b/patches/disable_tests.patch @@ -6,7 +6,7 @@ index 2a19faf..a4348f4 100644 } #[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 @@ index 7c34f7e..5b9f3ea 100644 } #[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(); 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(); |