Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f357199

Browse files
committed
[DO NOT MERGE] bootstrap: skip some tests that fail on specific jobs
1 parent 8d13566 commit f357199

File tree

1 file changed

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

1 file changed

+254
-4
lines changed

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

Lines changed: 254 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.
@@ -409,12 +410,261 @@ impl Step for RustAnalyzer {
409410
cargo.arg("--workspace");
410411
cargo.arg("--exclude=xtask");
411412

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

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /