Skip to content

Commit 54c6411

Browse files
committed
ui tests improvs
1 parent 5272806 commit 54c6411

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

build_system/src/test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,6 @@ fn should_remove_test(file_path: &Path) -> Result<bool, String> {
840840
"-Cllvm-args",
841841
"//~",
842842
"thread",
843-
"//@ known-bug"
844843
]
845844
.iter()
846845
.any(|check| line.contains(check))
@@ -928,6 +927,7 @@ where
928927
let nb_parts = args.nb_parts.unwrap_or(0);
929928
if nb_parts > 0 {
930929
let current_part = args.current_part.unwrap();
930+
// FIXME: create a function "display_if_not_quiet" or something along the line.
931931
println!(
932932
"Splitting ui_test into {} parts (and running part {})",
933933
nb_parts, current_part
@@ -1047,7 +1047,7 @@ fn prepare_files_callback_failing<'a>(
10471047
move |rust_path| {
10481048
let files = std::fs::read_to_string(file_path).unwrap_or_default();
10491049
let first_file_name = files.lines().next().unwrap_or("");
1050-
// If the first line ends with a `/`, we treat it as a directory.
1050+
// If the first line ends with a `/`, we treat all lines in the file as a directory.
10511051
if first_file_name.ends_with('/') {
10521052
// Treat as directory
10531053
// Removing all tests.
@@ -1110,7 +1110,7 @@ fn prepare_files_callback_success<'a>(
11101110
move |rust_path| {
11111111
let files = std::fs::read_to_string(file_path).unwrap_or_default();
11121112
let first_file_name = files.lines().next().unwrap_or("");
1113-
// If the first line ends with a `/`, we treat it as a directory.
1113+
// If the first line ends with a `/`, we treat all lines in the file as a directory.
11141114
if first_file_name.ends_with('/') {
11151115
if let Ok(files) = std::fs::read_to_string(file_path) {
11161116
for file in

tests/failing-ui-tests.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,8 @@ tests/ui/type-alias-impl-trait/rpit_tait_equality_in_canonical_query.rs
7272
tests/ui/impl-trait/equality-in-canonical-query.rs
7373
tests/ui/consts/issue-miri-1910.rs
7474
tests/ui/mir/mir_heavy_promoted.rs
75-
75+
tests/ui/consts/const_cmp_type_id.rs
76+
tests/ui/consts/issue-73976-monomorphic.rs
77+
tests/ui/consts/issue-94675.rs
78+
tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs
79+
tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs

0 commit comments

Comments
 (0)