diff mbox series

[v2,1/3] rust: Oe-selftest changes for rust v1.79

Message ID 20240829083358.1277849-1-Yash.Shinde@windriver.com
State Accepted, archived
Commit 61ec0f0f78d9db4c3fc02365713d5fd77b78a7ea
Headers show
Series [v2,1/3] rust: Oe-selftest changes for rust v1.79 | expand

Commit Message

Yash Shinde Aug. 29, 2024, 8:33 a.m. UTC
From: Yash Shinde <Yash.Shinde@windriver.com>

* Sort the exclude list in alphabetical order.

* Add some of the upsupported/failing tests to the exclude list
  and ignore the failing unit tests.

* Remove duplicated tests from the exclude list.

* Testing summary
    Target                PASS                    SKIPPED

    ARM                   17241                    599
    ARM64                 17279                    561
    MIPS64                17228                    612
    PPC                   17194                    629
    X86                   17257                    583
    X86-64                17416                    424

Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
---
 meta/lib/oeqa/selftest/cases/rust.py          | 170 +++++++++---------
 .../rust/files/rust-oe-selftest.patch         |  69 ++++---
 2 files changed, 122 insertions(+), 117 deletions(-)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py
index aa5814eccf..09487e3e23 100644
--- a/meta/lib/oeqa/selftest/cases/rust.py
+++ b/meta/lib/oeqa/selftest/cases/rust.py
@@ -67,10 +67,21 @@  class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
         # then runs tidy checks.
         exclude_list =  [
                             'compiler/rustc',
+                            'compiler/rustc_errors/src/markdown/tests/term.rs',
+                            'compiler/rustc_expand',
                             'compiler/rustc_interface/src/tests.rs',
+                            'compiler/rustc_span',
                             'library/panic_abort',
                             'library/panic_unwind',
+                            'library/std/src/io/buffered/tests.rs',
+                            'library/std/src/io/stdio/tests.rs',
+                            'library/std/src/sync/mpsc/sync_tests.rs',
+                            'library/std/src/sync/mpsc/tests.rs',
+                            'library/std/src/sync/mutex/tests.rs',
+                            'library/std/src/sync/rwlock/tests.rs',
+                            'library/std/src/thread/tests.rs',
                             'library/test/src/stats/tests.rs',
+                            'src/bootstrap',
                             'src/bootstrap/builder/tests.rs',
                             'src/doc/rustc',
                             'src/doc/rustdoc',
@@ -78,39 +89,100 @@  class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
                             'src/librustdoc',
                             'src/rustdoc-json-types',
                             'src/tools/compiletest/src/common.rs',
+                            'src/tools/jsondoclint',
                             'src/tools/lint-docs',
+                            'src/tools/replace-version-placeholder',
                             'src/tools/rust-analyzer',
                             'src/tools/rustdoc-themes',
+                            'src/tools/rust-installer',
+                            'src/tools/suggest-tests',
                             'src/tools/tidy',
+                            'src/tools/tidy/src/',
                             'tests/assembly/asm/aarch64-outline-atomics.rs',
+                            'tests/codegen/abi-efiapi.rs',
                             'tests/codegen/abi-main-signature-32bit-c-int.rs',
                             'tests/codegen/abi-repr-ext.rs',
+                            'tests/codegen/abi-sysv64.rs',
                             'tests/codegen/abi-x86-interrupt.rs',
+                            'tests/codegen/adjustments.rs',
+                            'tests/codegen/align-byval.rs',
+                            'tests/codegen/align-fn.rs',
+                            'tests/codegen/ascii-char.rs',
+                            'tests/codegen/asm-powerpc-clobbers.rs',
+                            'tests/codegen/async-fn-debug-awaitee-field.rs',
+                            'tests/codegen/binary-search-index-no-bound-check.rs',
+                            'tests/codegen/bool-cmp.rs',
                             'tests/codegen/branch-protection.rs',
+                            'tests/codegen/call-metadata.rs',
                             'tests/codegen/catch-unwind.rs',
                             'tests/codegen/cf-protection.rs',
+                            'tests/codegen/coercions.rs',
+                            'tests/codegen/cold-call-declare-and-call.rs',
+                            'tests/codegen/common_prim_int_ptr.rs',
+                            'tests/codegen/const_scalar_pair.rs',
+                            'tests/codegen/consts.rs',
+                            'tests/codegen/debug-accessibility/public-enum.rs',
+                            'tests/codegen/debug-accessibility/tuple-fields.rs',
+                            'tests/codegen/debug-alignment.rs',
+                            'tests/codegen/debug-column.rs',
+                            'tests/codegen/debuginfo-generic-closure-env-names.rs',
+                            'tests/codegen/debuginfo-inline-callsite-location.rs',
+                            'tests/codegen/debug-limited.rs',
+                            'tests/codegen/default-requires-uwtable.rs',
+                            'tests/codegen/drop.rs',
+                            'tests/codegen/dst-vtable-align-nonzero.rs',
+                            'tests/codegen/enable-lto-unit-splitting.rs',
                             'tests/codegen/enum-bounds-check-derived-idx.rs',
+                            'tests/codegen/enum/enum-bounds-check.rs',
+                            'tests/codegen/enum/enum-debug-tagged.rs',
+                            'tests/codegen/enum/enum-u128.rs',
+                            'tests/codegen/export-no-mangle.rs',
+                            'tests/codegen/fastcall-inreg.rs',
+                            'tests/codegen/float_math.rs',
+                            'tests/codegen/fn-impl-trait-self.rs',
                             'tests/codegen/force-unwind-tables.rs',
+                            'tests/codegen/frame-pointer.rs',
+                            'tests/codegen/i128-x86-align.rs',
+                            'tests/codegen/inherit_overflow.rs',
+                            'tests/codegen/inline-function-args-debug-info.rs',
                             'tests/codegen/intrinsic-no-unnamed-attr.rs',
+                            'tests/codegen/intrinsics/mask.rs',
+                            'tests/codegen/intrinsics/transmute-niched.rs',
+                            'tests/codegen/issues',
                             'tests/codegen/issues/issue-103840.rs',
+                            'tests/codegen/issues/issue-122805.rs',
                             'tests/codegen/issues/issue-47278.rs',
+                            'tests/codegen/issues/issue-73258.rs',
                             'tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs',
+                            'tests/codegen/issues/issue-75546.rs',
+                            'tests/codegen/issues/issue-77812.rs',
+                            'tests/codegen/issues/issue-98156-const-arg-temp-lifetime.rs',
                             'tests/codegen/lifetime_start_end.rs',
+                            'tests/codegen/llvm-ident.rs',
                             'tests/codegen/local-generics-in-exe-internalized.rs',
+                            'tests/codegen/macos/x86_64-macosx-deployment-target.rs',
+                            'tests/codegen/mainsubprogram.rs',
                             'tests/codegen/match-unoptimized.rs',
+                            'tests/codegen/meta-filecheck/check-prefix.rs',
+                            'tests/codegen/meta-filecheck/filecheck-flags.rs',
+                            'tests/codegen/move-operands.rs',
                             'tests/codegen/noalias-rwlockreadguard.rs',
+                            'tests/codegen/non-terminate/infinite-loop-1.rs',
                             'tests/codegen/non-terminate/nonempty-infinite-loop.rs',
                             'tests/codegen/noreturn-uninhabited.rs',
                             'tests/codegen/repr-transparent-aggregates-3.rs',
+                            'tests/codegen/repr/transparent-mips64.rs',
                             'tests/codegen/riscv-abi/call-llvm-intrinsics.rs',
-                            'tests/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs',
                             'tests/codegen/riscv-abi/riscv64-lp64d-abi.rs',
+                            'tests/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs',
                             'tests/codegen/sse42-implies-crc32.rs',
                             'tests/codegen/thread-local.rs',
                             'tests/codegen/uninit-consts.rs',
+                            'tests/mir-opt/',
                             'tests/pretty/raw-str-nonexpr.rs',
                             'tests/run-make',
                             'tests/run-make-fulldeps',
+                            'tests/run-pass-valgrind',
                             'tests/rustdoc',
                             'tests/rustdoc-json',
                             'tests/rustdoc-js-std',
@@ -133,111 +205,33 @@  class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
                             'tests/rustdoc-ui/test-no_std.rs',
                             'tests/rustdoc-ui/test-type.rs',
                             'tests/rustdoc/unit-return.rs',
+                            'tests/ui/abi/extern',
                             'tests/ui/abi/stack-probes-lto.rs',
                             'tests/ui/abi/stack-probes.rs',
+                            'tests/ui/allocator',
+                            'tests/ui/array-slice-vec',
                             'tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs',
                             'tests/ui/asm/x86_64/sym.rs',
+                            'tests/ui/associated-consts',
                             'tests/ui/associated-type-bounds/fn-apit.rs',
                             'tests/ui/associated-type-bounds/fn-dyn-apit.rs',
                             'tests/ui/associated-type-bounds/fn-wrap-apit.rs',
+                            'tests/ui/associated-types',
+                            'tests/ui/codegen/mismatched-data-layouts.rs',
                             'tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs',
                             'tests/ui/drop/dynamic-drop.rs',
                             'tests/ui/empty_global_asm.rs',
+                            'tests/ui-fulldeps/',
                             'tests/ui/functions-closures/fn-help-with-err.rs',
                             'tests/ui/linkage-attr/issue-10755.rs',
                             'tests/ui/macros/restricted-shadowing-legacy.rs',
+                            'tests/ui/numbers-arithmetic/u128.rs',
                             'tests/ui/process/nofile-limit.rs',
                             'tests/ui/process/process-panic-after-fork.rs',
                             'tests/ui/process/process-sigpipe.rs',
                             'tests/ui/simd/target-feature-mixup.rs',
                             'tests/ui/structs-enums/multiple-reprs.rs',
-                            'src/tools/jsondoclint',
-                            'src/tools/replace-version-placeholder',
-                            'tests/codegen/abi-efiapi.rs',
-                            'tests/codegen/abi-sysv64.rs',
-                            'tests/codegen/align-byval.rs',
-                            'tests/codegen/align-fn.rs',
-                            'tests/codegen/asm-powerpc-clobbers.rs',
-                            'tests/codegen/async-fn-debug-awaitee-field.rs',
-                            'tests/codegen/binary-search-index-no-bound-check.rs',
-                            'tests/codegen/call-metadata.rs',
-                            'tests/codegen/debug-column.rs',
-                            'tests/codegen/debug-limited.rs',
-                            'tests/codegen/debuginfo-generic-closure-env-names.rs',
-                            'tests/codegen/drop.rs',
-                            'tests/codegen/dst-vtable-align-nonzero.rs',
-                            'tests/codegen/enable-lto-unit-splitting.rs',
-                            'tests/codegen/enum/enum-u128.rs',
-                            'tests/codegen/fn-impl-trait-self.rs',
-                            'tests/codegen/inherit_overflow.rs',
-                            'tests/codegen/inline-function-args-debug-info.rs',
-                            'tests/codegen/intrinsics/mask.rs',
-                            'tests/codegen/intrinsics/transmute-niched.rs',
-                            'tests/codegen/issues/issue-73258.rs',
-                            'tests/codegen/issues/issue-75546.rs',
-                            'tests/codegen/issues/issue-77812.rs',
-                            'tests/codegen/issues/issue-98156-const-arg-temp-lifetime.rs',
-                            'tests/codegen/llvm-ident.rs',
-                            'tests/codegen/mainsubprogram.rs',
-                            'tests/codegen/move-operands.rs',
-                            'tests/codegen/repr/transparent-mips64.rs',
-                            'tests/mir-opt/',
-                            'tests/rustdoc-json',
-                            'tests/rustdoc-ui/doc-test-rustdoc-feature.rs',
-                            'tests/rustdoc-ui/no-run-flag.rs',
-                            'tests/ui-fulldeps/',
-                            'tests/ui/numbers-arithmetic/u128.rs'
-                            'tests/run-pass-valgrind',
-                            'tests/ui/codegen/mismatched-data-layouts.rs',
-                            'tests/codegen/i128-x86-align.rs',
-                            'src/tools/suggest-tests',
-                            'src/tools/rust-installer',
-                            'src/bootstrap',
-                            'src/tools/tidy/src/',
-                            'library/std/src/thread/tests.rs',
-                            'compiler/rustc_errors/src/markdown/tests/term.rs',
-                            'compiler/rustc_interface/src/tests.rs',
-                            'library/std/src/io/buffered/tests.rs',
-                            'library/std/src/io/stdio/tests.rs',
-                            'library/std/src/sync/mpsc/sync_tests.rs',
-                            'library/std/src/sync/mpsc/tests.rs',
-                            'library/std/src/sync/mutex/tests.rs',
-                            'library/std/src/sync/rwlock/tests.rs',
-                            'library/std/src/thread/tests.rs',
-                            'library/test/src/stats/tests.rs',
-                            'tidyselftest',
-                            'compiler/rustc_span',
-                            'compiler/rustc_expand',
-                            'tests/ui/array-slice-vec',
-                            'tests/ui/associated-consts',
-                            'tests/ui/associated-types',
-                            'tests/ui/allocator',
-                            'tests/ui/abi/extern',
-                            'tests/codegen/non-terminate/infinite-loop-1.rs',
-                            'tests/codegen/coercions.rs',
-                            'tests/codegen/const_scalar_pair.rs',
-                            'tests/codegen/cold-call-declare-and-call.rs',
-                            'tests/codegen/issues',
-                            'tests/codegen/bool-cmp.rs',
-                            'tests/codegen/ascii-char.rs',
-                            'tests/codegen/frame-pointer.rs',
-                            'tests/codegen/common_prim_int_ptr.rs',
-                            'tests/codegen/default-requires-uwtable.rs',
-                            'tests/codegen/debug-accessibility/public-enum.rs',
-                            'tests/codegen/meta-filecheck/filecheck-flags.rs',
-                            'tests/codegen/float_math.rs',
-                            'tests/codegen/debug-accessibility/tuple-fields.rs',
-                            'tests/codegen/consts.rs',
-                            'tests/codegen/enum/enum-bounds-check.rs',
-                            'tests/codegen/debug-alignment.rs',
-                            'tests/codegen/export-no-mangle.rs',
-                            'tests/codegen/fastcall-inreg.rs',
-                            'tests/codegen/debuginfo-inline-callsite-location.rs',
-                            'tests/codegen/enum/enum-debug-tagged.rs',
-                            'tests/codegen/adjustments.rs',
-                            'tests/codegen/macos/x86_64-macosx-deployment-target.rs',
-                            'tests/codegen/frame-pointer.rs',
-                            'tests/codegen/meta-filecheck/check-prefix.rs'
+                            'tidyselftest'
                         ]
 
         exclude_fail_tests = " ".join([" --exclude " + item for item in exclude_list])
diff --git a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
index a69c1e5237..01c3634d9f 100644
--- a/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
+++ b/meta/recipes-devtools/rust/files/rust-oe-selftest.patch
@@ -8,7 +8,7 @@  Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
 diff --git a/compiler/rustc_errors/src/markdown/tests/term.rs b/compiler/rustc_errors/src/markdown/tests/term.rs
 --- a/compiler/rustc_errors/src/markdown/tests/term.rs
 +++ b/compiler/rustc_errors/src/markdown/tests/term.rs
-@@ -60,6 +60,7 @@
+@@ -61,6 +61,7 @@ fn test_wrapping_write() {
  }
 
  #[test]
@@ -19,31 +19,30 @@  diff --git a/compiler/rustc_errors/src/markdown/tests/term.rs b/compiler/rustc_e
 diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs
 --- a/compiler/rustc_interface/src/tests.rs
 +++ b/compiler/rustc_interface/src/tests.rs
-@@ -116,6 +116,7 @@
+@@ -137,6 +137,7 @@ fn assert_non_crate_hash_different(x: &Options, y: &Options) {
 
  // When the user supplies --test we should implicitly supply --cfg test
  #[test]
 +#[ignore]
  fn test_switch_implies_cfg_test() {
-     rustc_span::create_default_session_globals_then(|| {
-         let matches = optgroups().parse(&["--test".to_string()]).unwrap();
-@@ -127,6 +128,7 @@
+     sess_and_cfg(&["--test"], |_sess, cfg| {
+         assert!(cfg.contains(&(sym::test, None)));
+@@ -145,6 +146,7 @@ fn test_switch_implies_cfg_test() {
 
  // When the user supplies --test and --cfg test, don't implicitly add another --cfg test
  #[test]
 +#[ignore]
  fn test_switch_implies_cfg_test_unless_cfg_test() {
-     rustc_span::create_default_session_globals_then(|| {
-         let matches = optgroups().parse(&["--test".to_string(), "--cfg=test".to_string()]).unwrap();
-@@ -139,6 +141,7 @@
+     sess_and_cfg(&["--test", "--cfg=test"], |_sess, cfg| {
+         let mut test_items = cfg.iter().filter(|&&(name, _)| name == sym::test);
+@@ -154,6 +156,7 @@ fn test_switch_implies_cfg_test_unless_cfg_test() {
  }
 
  #[test]
 +#[ignore]
  fn test_can_print_warnings() {
-     rustc_span::create_default_session_globals_then(|| {
-         let matches = optgroups().parse(&["-Awarnings".to_string()]).unwrap();
-
+     sess_and_cfg(&["-Awarnings"], |sess, _cfg| {
+         assert!(!sess.dcx().can_emit_warnings());
 diff --git a/library/test/src/stats/tests.rs b/library/test/src/stats/tests.rs
 --- a/library/test/src/stats/tests.rs
 +++ b/library/test/src/stats/tests.rs
@@ -59,7 +58,7 @@  diff --git a/library/std/src/io/buffered/tests.rs b/library/std/src/io/buffered/
 index 35a5291a347..5f2858d2505 100644
 --- a/library/std/src/io/buffered/tests.rs
 +++ b/library/std/src/io/buffered/tests.rs
-@@ -485,6 +485,7 @@ fn flush(&mut self) -> io::Result<()> {
+@@ -488,6 +488,7 @@ fn flush(&mut self) -> io::Result<()> {
  }
 
  #[test]
@@ -187,7 +186,7 @@  index 1786a3c09ff..9dcead7092b 100644
  fn test_mutex_arc_poison() {
      let arc = Arc::new(Mutex::new(1));
      assert!(!arc.is_poisoned());
-@@ -205,6 +209,7 @@ fn test_mutex_arc_nested() {
+@@ -220,6 +220,7 @@ fn test_mutex_arc_nested() {
  }
 
  #[test]
@@ -199,7 +198,7 @@  diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/rwlock/
 index 1a9d3d3f12f..0a9cfc48806 100644
 --- a/library/std/src/sync/rwlock/tests.rs
 +++ b/library/std/src/sync/rwlock/tests.rs
-@@ -44,6 +44,7 @@ fn frob() {
+@@ -47,6 +47,7 @@ fn frob() {
  }
 
  #[test]
@@ -207,7 +206,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_rw_arc_poison_wr() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -56,6 +57,7 @@ fn test_rw_arc_poison_wr() {
+@@ -72,6 +73,7 @@ fn test_rw_arc_poison_mapped_w_r() {
  }
 
  #[test]
@@ -215,7 +214,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_rw_arc_poison_ww() {
      let arc = Arc::new(RwLock::new(1));
      assert!(!arc.is_poisoned());
-@@ -70,6 +72,7 @@ fn test_rw_arc_poison_ww() {
+@@ -100,6 +102,7 @@ fn test_rw_arc_poison_mapped_w_w() {
  }
 
  #[test]
@@ -223,7 +222,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_rw_arc_no_poison_rr() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -127,6 +127,7 @@
+@@ -127,6 +130,7 @@ fn test_rw_arc_no_poison_mapped_r_r() {
  }
 
  #[test]
@@ -231,7 +230,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_rw_arc_no_poison_rw() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -133,6 +137,7 @@ fn test_rw_arc() {
+@@ -192,6 +196,7 @@ fn test_rw_arc() {
  }
 
  #[test]
@@ -239,7 +238,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_rw_arc_access_in_unwind() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -206,6 +211,7 @@ fn drop(&mut self) {
+@@ -275,6 +280,7 @@ fn drop(&mut self) {
  }
 
  #[test]
@@ -247,7 +246,7 @@  index 1a9d3d3f12f..0a9cfc48806 100644
  fn test_into_inner_poison() {
      let m = Arc::new(RwLock::new(NonCopy(10)));
      let m2 = m.clone();
-@@ -230,6 +236,7 @@ fn test_get_mut() {
+@@ -299,6 +305,7 @@ fn test_get_mut() {
  }
 
  #[test]
@@ -279,7 +278,7 @@  diff --git a/library/std/src/thread/tests.rs b/library/std/src/thread/tests.rs
 index 5d6b9e94ee9..a5aacb2eb87 100644
 --- a/library/std/src/thread/tests.rs
 +++ b/library/std/src/thread/tests.rs
-@@ -115,6 +115,7 @@ fn test_is_finished() {
+@@ -116,6 +116,7 @@ fn test_is_finished() {
  }
 
  #[test]
@@ -287,7 +286,7 @@  index 5d6b9e94ee9..a5aacb2eb87 100644
  fn test_join_panic() {
      match thread::spawn(move || panic!()).join() {
          result::Result::Err(_) => (),
-@@ -217,6 +218,7 @@ fn test_simple_newsched_spawn() {
+@@ -218,6 +219,7 @@ fn test_simple_newsched_spawn() {
  }
 
  #[test]
@@ -295,7 +294,7 @@  index 5d6b9e94ee9..a5aacb2eb87 100644
  fn test_try_panic_message_string_literal() {
      match thread::spawn(move || {
          panic!("static string");
-@@ -233,6 +235,7 @@ fn test_try_panic_message_string_literal() {
+@@ -234,6 +236,7 @@ fn test_try_panic_message_string_literal() {
  }
 
  #[test]
@@ -303,7 +302,7 @@  index 5d6b9e94ee9..a5aacb2eb87 100644
  fn test_try_panic_any_message_owned_str() {
      match thread::spawn(move || {
          panic_any("owned string".to_string());
-@@ -249,6 +252,7 @@ fn test_try_panic_any_message_owned_str() {
+@@ -250,6 +253,7 @@ fn test_try_panic_any_message_owned_str() {
  }
 
  #[test]
@@ -311,7 +310,7 @@  index 5d6b9e94ee9..a5aacb2eb87 100644
  fn test_try_panic_any_message_any() {
      match thread::spawn(move || {
          panic_any(Box::new(413u16) as Box<dyn Any + Send>);
-@@ -267,6 +271,7 @@ fn test_try_panic_any_message_any() {
+@@ -268,6 +272,7 @@ fn test_try_panic_any_message_any() {
  }
 
  #[test]
@@ -363,10 +362,10 @@  diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/te
  fn panic_while_mapping_unlocked_poison() {
      let lock = Mutex::new(());
 
-diff --git a/
+diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/rwlock/tests.rs
 --- a/library/std/src/sync/rwlock/tests.rs
 +++ b/library/std/src/sync/rwlock/tests.rs
-@@ -60,6 +60,7 @@
+@@ -59,6 +59,7 @@ fn test_rw_arc_poison_wr() {
  }
 
  #[test]
@@ -374,7 +373,7 @@  diff --git a/
  fn test_rw_arc_poison_mapped_w_r() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -88,6 +89,7 @@
+@@ -86,6 +87,7 @@ fn test_rw_arc_poison_ww() {
  }
 
  #[test]
@@ -382,7 +381,7 @@  diff --git a/
  fn test_rw_arc_poison_mapped_w_w() {
      let arc = Arc::new(RwLock::new(1));
      let arc2 = arc.clone();
-@@ -438,6 +440,7 @@
+@@ -431,6 +433,7 @@ fn panic_while_mapping_read_unlocked_no_poison() {
  }
 
  #[test]
@@ -390,3 +389,15 @@  diff --git a/
  fn panic_while_mapping_write_unlocked_poison() {
      let lock = RwLock::new(());
 
+diff --git a/library/core/benches/num/int_log/mod.rs b/library/core/benches/num/int_log/mod.rs
+index 3807cd5d76c..018c5c04456 100644
+--- a/library/core/benches/num/int_log/mod.rs
++++ b/library/core/benches/num/int_log/mod.rs
+@@ -98,6 +98,7 @@ fn $random_small(bench: &mut Bencher) {
+         }
+
+         #[bench]
++        #[ignore]
+         fn $geometric(bench: &mut Bencher) {
+             let bases: [$t; 16] = [2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65];
+             let base_and_numbers: Vec<($t, Vec<$t>)> = bases