Skip to content

Commit 86a2bb7

Browse files
committed
Fix CI
1 parent 42a0d63 commit 86a2bb7

File tree

3 files changed

+5
-42
lines changed

3 files changed

+5
-42
lines changed

build_system/src/test.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -919,10 +919,9 @@ fn should_remove_test(file_path: &Path) -> Result<bool, String> {
919919
continue;
920920
}
921921
if [
922-
"// error-pattern:",
923-
"// @error-pattern:",
924-
"// build-fail",
925-
"// run-fail",
922+
"//@ error-pattern:",
923+
"//@ build-fail",
924+
"//@ run-fail",
926925
"-Cllvm-args",
927926
"//~",
928927
"thread",
@@ -1016,6 +1015,8 @@ where
10161015
// Tests generating errors.
10171016
remove_file(&rust_path.join("tests/ui/consts/issue-94675.rs"))?;
10181017
remove_file(&rust_path.join("tests/ui/mir/mir_heavy_promoted.rs"))?;
1018+
remove_file(&rust_path.join("tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs"))?;
1019+
remove_file(&rust_path.join("tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs"))?;
10191020

10201021
walk_dir(rust_path.join("tests/ui"), dir_handling, file_handling)?;
10211022

tests/failing-lto-tests.txt

-5
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,12 @@ tests/ui/fmt/format-args-capture-issue-106408.rs
2121
tests/ui/fmt/indoc-issue-106408.rs
2222
tests/ui/hygiene/issue-77523-def-site-async-await.rs
2323
tests/ui/inherent-impls-overlap-check/no-overlap.rs
24-
tests/ui/annotate-snippet/multispan.rs
2524
tests/ui/enum-discriminant/issue-46519.rs
2625
tests/ui/issues/issue-45731.rs
2726
tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
2827
tests/ui/macros/macro-comma-behavior-rpass.rs
2928
tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
3029
tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
3130
tests/ui/macros/stringify.rs
32-
tests/ui/panics/test-panic.rs
33-
tests/ui/panics/test-should-fail-bad-message.rs
34-
tests/ui/panics/test-should-panic-bad-message.rs
35-
tests/ui/panics/test-should-panic-no-message.rs
3631
tests/ui/reexport-test-harness-main.rs
3732
tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs

tests/failing-ui-tests.txt

-33
Original file line numberDiff line numberDiff line change
@@ -69,41 +69,8 @@ tests/ui/async-await/deep-futures-are-freeze.rs
6969
tests/ui/closures/capture-unsized-by-ref.rs
7070
tests/ui/coroutine/resume-after-return.rs
7171
tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
72-
tests/ui/limits/issue-17913.rs
73-
tests/ui/limits/issue-55878.rs
74-
tests/ui/linkage-attr/common-linkage-non-zero-init.rs
75-
tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
76-
tests/ui/numbers-arithmetic/divide-by-zero.rs
77-
tests/ui/numbers-arithmetic/mod-zero.rs
78-
tests/ui/numbers-arithmetic/overflowing-neg-nonzero.rs
79-
tests/ui/optimization-remark.rs
80-
tests/ui/panic-handler/panic-handler-std.rs
81-
tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
82-
tests/ui/panic-runtime/need-unwind-got-abort.rs
83-
tests/ui/panics/issue-47429-short-backtraces.rs
84-
tests/ui/panics/panic-in-cleanup.rs
85-
tests/ui/panics/panic-in-ffi.rs
86-
tests/ui/panics/runtime-switch.rs
87-
tests/ui/panics/short-ice-remove-middle-frames-2.rs
88-
tests/ui/panics/short-ice-remove-middle-frames.rs
89-
tests/ui/precondition-checks/out-of-bounds-get-unchecked.rs
9072
tests/ui/simd/masked-load-store.rs
9173
tests/ui/simd/repr_packed.rs
92-
tests/ui/type_length_limit.rs
9374
tests/ui/async-await/in-trait/dont-project-to-specializable-projection.rs
94-
tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs
95-
tests/ui/c-variadic/issue-86053-1.rs
96-
tests/ui/const-ptr/out_of_bounds_read.rs
97-
tests/ui/consts/const_unsafe_unreachable_ub.rs
98-
tests/ui/consts/miri_unleashed/drop.rs
99-
tests/ui/consts/timeout.rs
10075
tests/ui/consts/try-operator.rs
101-
tests/ui/coroutine/coroutine-resume-after-panic.rs
10276
tests/ui/coroutine/unwind-abort-mix.rs
103-
tests/ui/duplicate/dupe-symbols-7.rs
104-
tests/ui/duplicate/dupe-symbols-8.rs
105-
tests/ui/hygiene/panic-location.rs
106-
tests/ui/invalid/issue-114435-layout-type-err.rs
107-
tests/ui/invalid-compile-flags/invalid-llvm-passes.rs
108-
tests/ui/lto/issue-105637.rs
109-
tests/ui/lto/lto-duplicate-symbols.rs

0 commit comments

Comments
 (0)