Skip to content

Commit 6fb78a4

Browse files
jieyouxujieyouxu
committed
[DO NOT MERGE] bootstrap: skip some tests that fail on specific jobs
1 parent 2ee1039 commit 6fb78a4

File tree

1 file changed

+237
-4
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+237
-4
lines changed

‎src/bootstrap/src/core/build_steps/test.rs‎

Lines changed: 237 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore-tidy-filelength
12
//! Build-and-run steps for `./x.py test` test fixtures
23
//!
34
//! `./x.py test` (aka [`Kind::Test`]) is currently allowed to reach build steps in other modules.
@@ -408,12 +409,244 @@ impl Step for RustAnalyzer {
408409
cargo.arg("--workspace");
409410
cargo.arg("--exclude=xtask");
410411

412+
let mut skip_tests = vec![
413+
// FIXME: may need a fix from https://github.com/rust-lang/rust-analyzer/pull/19124.
414+
"config::tests::cargo_target_dir_subdir",
415+
];
416+
skip_tests.extend(if self.host.starts_with("aarch64-apple") {
417+
// FIXME: fails on `aarch64-apple` due to `cfg` differences
418+
vec![
419+
"item_tree::tests::generics_with_attributes",
420+
"hover::tests::generic_params_disabled_by_cfg",
421+
]
422+
} else if self.host == "i686-pc-windows-gnu" {
423+
// FIXME: fails on `i686-mingw` due to multiple reasons. E.g. unsupport op on 32-bit
424+
// windows-gnu target but on a 64-bit host, i.e. ptr width being different is
425+
// unsupported.
426+
vec![
427+
// FIXME: failed to const eval on 32-bit windows-gnu running on 64-bit host maybe?
428+
"consteval::tests::add",
429+
"consteval::tests::anonymous_const_block",
430+
"consteval::tests::alignment",
431+
"consteval::tests::bit_op",
432+
"consteval::tests::associated_types",
433+
"consteval::tests::boxes",
434+
"consteval::tests::array_and_index",
435+
"consteval::tests::builtin_derive_macro",
436+
"consteval::tests::casts",
437+
"consteval::tests::const_generic_subst_assoc_const_impl",
438+
"consteval::tests::c_string",
439+
"consteval::tests::const_generic_subst_fn",
440+
"consteval::tests::const_impl_assoc",
441+
"consteval::tests::closure_clone",
442+
"consteval::tests::byte_string",
443+
"consteval::tests::closures",
444+
"consteval::tests::const_trait_assoc",
445+
"consteval::tests::coerce_unsized",
446+
"consteval::tests::consts",
447+
"consteval::tests::enums",
448+
"consteval::tests::floating_point",
449+
"consteval::tests::destructing_assignment",
450+
"consteval::tests::floating_point_casts",
451+
"consteval::tests::closure_and_impl_fn",
452+
"consteval::tests::extern_weak_statics",
453+
"consteval::tests::function_call",
454+
"consteval::tests::function_param_patterns",
455+
"consteval::tests::closure_capture_unsized_type",
456+
"consteval::tests::function_pointer",
457+
"consteval::tests::from_ne_bytes",
458+
"consteval::tests::function_pointer_in_constants",
459+
"consteval::tests::from_trait",
460+
"consteval::tests::ifs",
461+
"consteval::tests::generic_fn",
462+
"consteval::tests::dyn_trait",
463+
"consteval::tests::impl_trait",
464+
"consteval::tests::enum_variant_as_function",
465+
"consteval::tests::const_transfer_memory",
466+
"consteval::tests::intrinsics::allocator",
467+
"consteval::tests::function_traits",
468+
"consteval::tests::intrinsics::copy_nonoverlapping",
469+
"consteval::tests::intrinsics::ctlz",
470+
"consteval::tests::intrinsics::ctpop",
471+
"consteval::tests::intrinsics::cttz",
472+
"consteval::tests::intrinsics::const_eval_select",
473+
"consteval::tests::intrinsics::floating_point",
474+
"consteval::tests::for_loops",
475+
"consteval::tests::function_pointer_and_niche_optimization",
476+
"consteval::tests::intrinsics::likely",
477+
"consteval::tests::intrinsics::arith_offset",
478+
"consteval::tests::intrinsics::overflowing_add",
479+
"consteval::tests::intrinsics::atomic",
480+
"consteval::tests::intrinsics::rotate",
481+
"consteval::tests::intrinsics::copy",
482+
"consteval::tests::intrinsics::read_via_copy",
483+
"consteval::tests::intrinsics::saturating",
484+
"consteval::tests::intrinsics::needs_drop",
485+
"consteval::tests::intrinsics::size_of",
486+
"consteval::tests::intrinsics::simd",
487+
"consteval::tests::intrinsics::min_align_of_val",
488+
"consteval::tests::intrinsics::transmute",
489+
"consteval::tests::intrinsics::type_name",
490+
"consteval::tests::intrinsics::wrapping_add",
491+
"consteval::tests::intrinsics::write_bytes",
492+
"consteval::tests::intrinsics::write_via_move",
493+
"consteval::tests::let_else",
494+
"consteval::tests::layout_of_type_with_associated_type_field_defined_inside_body",
495+
"consteval::tests::loops",
496+
"consteval::tests::locals",
497+
"consteval::tests::intrinsics::offset",
498+
"consteval::tests::intrinsics::size_of_val",
499+
"consteval::tests::or_pattern",
500+
"consteval::tests::memory_limit",
501+
"consteval::tests::intrinsics::ptr_offset_from",
502+
"consteval::tests::intrinsics::discriminant_value",
503+
"consteval::tests::path_pattern_matching",
504+
"consteval::tests::overloaded_binop",
505+
"consteval::tests::overloaded_deref",
506+
"consteval::tests::overloaded_index",
507+
"consteval::tests::overloaded_deref_autoref",
508+
"consteval::tests::pattern_matching_ergonomics",
509+
"consteval::tests::pattern_matching_literal",
510+
"consteval::tests::pattern_matching_range",
511+
"consteval::tests::manual_fn_trait_impl",
512+
"consteval::tests::recursion",
513+
"consteval::tests::reference_autoderef",
514+
"consteval::tests::references",
515+
"consteval::tests::ranges",
516+
"consteval::tests::raw_pointer_equality",
517+
"consteval::tests::match_guards",
518+
"consteval::tests::structs",
519+
"consteval::tests::options",
520+
"consteval::tests::trait_method",
521+
"consteval::tests::trait_basic",
522+
"consteval::tests::pattern_matching_slice",
523+
"consteval::tests::string",
524+
"consteval::tests::trait_method_inside_block",
525+
"consteval::tests::statics",
526+
"consteval::tests::tuples",
527+
"consteval::tests::unions",
528+
"consteval::tests::result_layout_niche_optimization",
529+
"consteval::tests::unsized_field",
530+
"consteval::tests::try_block",
531+
"consteval::tests::try_operator",
532+
"mir::eval::tests::closure_capture_array_const_generic",
533+
"mir::eval::tests::closure_layout_in_rpit",
534+
"mir::eval::tests::drop_basic",
535+
"mir::eval::tests::closure_state",
536+
"mir::eval::tests::drop_in_place",
537+
"mir::eval::tests::field_with_associated_type",
538+
"mir::eval::tests::function_with_extern_c_abi",
539+
"mir::eval::tests::generic_impl_for_trait_with_generic_method",
540+
"mir::eval::tests::drop_if_let",
541+
"mir::eval::tests::drop_struct_field",
542+
"mir::eval::tests::index_of_slice_should_preserve_len",
543+
"mir::eval::tests::for_loop",
544+
"mir::eval::tests::manually_drop",
545+
"mir::eval::tests::from_fn",
546+
"mir::eval::tests::long_str_eq_same_prefix",
547+
"mir::eval::tests::posix_getenv",
548+
"mir::eval::tests::memcmp",
549+
"mir::eval::tests::panic_display",
550+
"mir::eval::tests::self_with_capital_s",
551+
"mir::eval::tests::short_circuit_operator",
552+
"mir::eval::tests::panic_fmt",
553+
"mir::eval::tests::regression_14966",
554+
"mir::eval::tests::posix_tls",
555+
"mir::eval::tests::specialization_array_clone",
556+
"mir::eval::tests::unix_write_stdout",
557+
"mir::eval::tests::syscalls",
558+
"tests::regression::regression_14456",
559+
"tests::simple::const_eval_array_repeat_expr",
560+
"tests::simple::const_eval_in_function_signature",
561+
"tests::simple::issue_14275",
562+
"tests::traits::array_length",
563+
"tests::traits::const_generics",
564+
// FIXME: annotation order seems to be different on `i686-mingw`
565+
"annotations::tests::runnable_annotation",
566+
"annotations::tests::struct_references_annotations",
567+
"annotations::tests::struct_and_trait_impls_annotations",
568+
"annotations::tests::method_annotations",
569+
// FIXME: const eval on hover not working, either shows infer `_` or unevaluated.
570+
"hover::tests::array_repeat_exp",
571+
"hover::tests::const_generic_negative_i8_literal",
572+
"hover::tests::hover_const_eval",
573+
"hover::tests::hover_const_eval_discriminant",
574+
"hover::tests::hover_const_eval_enum",
575+
"hover::tests::hover_const_eval_floating_point",
576+
"hover::tests::hover_const_static",
577+
"hover::tests::hover_const_pat",
578+
"hover::tests::hover_const_eval_slice",
579+
"hover::tests::hover_eval_complex_constants",
580+
"hover::tests::hover_unsigned_max_const",
581+
"hover::tests::i128_max",
582+
// FIXME: failed to const eval, formatting difference in const struct
583+
// (extra comma / reformatted?)
584+
"hover::tests::hover_const_eval_str",
585+
// FIXME: failed to const eval, extra path segment
586+
"hover::tests::hover_const_value",
587+
"hover::tests::hover_dollar_crate",
588+
"hover::tests::hover_dollar_crate stdout",
589+
// FIXME: failed to const eval, shows explicit `i32` on literal
590+
"hover::tests::hover_const_eval_dyn_trait",
591+
// FIXME: discriminant `= ?` problems
592+
"inlay_hints::discriminant::tests::datacarrying_mixed",
593+
"inlay_hints::discriminant::tests::fieldless",
594+
// FIXME: list order non-deterministic or different on `i686-mingw`?
595+
"runnables::tests::tests_are_unique",
596+
// FIXME: HTML element attribute order maybe non-deterministic or different on
597+
// `i686-mingw`?
598+
"syntax_highlighting::tests::test_rainbow_highlighting",
599+
// FIXME: enum discrim not evaluated?
600+
"handlers::explicit_enum_discriminant::tests::non_primitive_repr_non_data_bearing_add_discriminant",
601+
"tests::generated::doctest_explicit_enum_discriminant",
602+
// FIXME: import is different
603+
"handlers::add_explicit_type::tests::regression_issue_2922",
604+
// FIXME: assist no source changes
605+
"handlers::explicit_enum_discriminant::tests::primitive_repr_non_data_bearing_add_discriminant",
606+
// FIXME: code action not applicable
607+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_array",
608+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_recursive",
609+
"handlers::explicit_enum_discriminant::tests::primitive_repr_non_data_bearing_add_discriminant",
610+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_array",
611+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_recursive",
612+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_scalar_calculate_expr",
613+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_scalar_calculate_param_expr",
614+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_slice_single",
615+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_tuple",
616+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_block_eval_block_expr",
617+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_block_tuple_scalar_calculate_block_expr",
618+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_block_eval_expr",
619+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_block_expr",
620+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_expr",
621+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_fn_call_block_nested_builtin",
622+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_fn_call_builtin",
623+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_const_fn_call_tuple",
624+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_block_expr_to_str_lit",
625+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_if_expr_to_str_lit",
626+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_call_expr_to_str_lit",
627+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_block_macro_expr_to_str_lit",
628+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_macro_expr_to_str_lit",
629+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_eval_const_match_expr_to_str_lit",
630+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_expr_as_str_lit",
631+
"handlers::inline_const_as_literal::tests::inline_const_as_literal_scalar_operators",
632+
// FIXME: assist is not applicable
633+
"tests::generated::doctest_inline_const_as_literal",
634+
]
635+
} else if self.host == "x86_64-apple-darwin" {
636+
vec![
637+
// FIXME: missing `#[cfg(never)]` on struct generic param
638+
"item_tree::tests::generics_with_attributes",
639+
]
640+
} else {
641+
vec![]
642+
});
643+
644+
let skip_tests = skip_tests.iter().map(|name| format!("--skip={name}")).collect::<Vec<_>>();
645+
let skip_tests = skip_tests.iter().map(|s| s.as_str()).collect::<Vec<_>>();
646+
411647
run_cargo_test(
412648
cargo,
413-
&[
414-
// FIXME: may need a fix from https://github.com/rust-lang/rust-analyzer/pull/19124.
415-
"--skip=config::tests::cargo_target_dir_subdir",
416-
],
649+
skip_tests.as_slice(),
417650
&[],
418651
"rust-analyzer",
419652
"rust-analyzer",

0 commit comments

Comments
 (0)