Skip to content

Commit e7b7c98

Browse files
committed
Fix tests
1 parent c3d5b7f commit e7b7c98

File tree

5 files changed

+59
-49
lines changed

5 files changed

+59
-49
lines changed

build_system/src/prepare.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,21 +159,6 @@ where
159159
let repo_path = Path::new(crate::BUILD_DIR).join(&clone_result.repo_name);
160160
run_command(&[&"git", &"checkout", &"--", &"."], Some(&repo_path))?;
161161
run_command(&[&"git", &"checkout", &checkout_commit], Some(&repo_path))?;
162-
let filter = format!("-{}-", clone_result.repo_name);
163-
walk_dir(
164-
"patches/crate_patches",
165-
|_| Ok(()),
166-
|file_path| {
167-
let patch = file_path.as_os_str().to_str().unwrap();
168-
if patch.contains(&filter) && patch.ends_with(".patch") {
169-
run_command_with_output(
170-
&[&"git", &"am", &file_path.canonicalize().unwrap()],
171-
Some(&repo_path),
172-
)?;
173-
}
174-
Ok(())
175-
},
176-
)?;
177162
if let Some(extra) = extra {
178163
extra(&repo_path)?;
179164
}
@@ -238,7 +223,7 @@ pub fn run() -> Result<(), String> {
238223
let to_clone = &[
239224
(
240225
"https://github.com/rust-random/rand.git",
241-
"0f933f9c7176e53b2a3c7952ded484e1783f0bf1",
226+
"1f4507a8e1cf8050e4ceef95eeda8f64645b6719",
242227
None,
243228
),
244229
(

patches/crate_patches/0002-rand-Disable-failing-test.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

tests/failing-lto-tests.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/ui/lint/unsafe_code/forge_unsafe_block.rs
22
tests/ui/lint/unused-qualification-in-derive-expansion.rs
3-
tests/ui/macro-quote-test.rs
3+
tests/ui/macros/macro-quote-test.rs
44
tests/ui/macros/proc_macro.rs
55
tests/ui/panic-runtime/lto-unwind.rs
66
tests/ui/resolve/derive-macro-1.rs
@@ -21,3 +21,17 @@ 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
25+
tests/ui/enum-discriminant/issue-46519.rs
26+
tests/ui/issues/issue-45731.rs
27+
tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
28+
tests/ui/macros/macro-comma-behavior-rpass.rs
29+
tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
30+
tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
31+
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
36+
tests/ui/reexport-test-harness-main.rs
37+
tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs

tests/failing-ui-tests.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,42 @@ 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/numbers-arithmetic/overflowing-neg.rs
80+
tests/ui/optimization-remark.rs
81+
tests/ui/panic-handler/panic-handler-std.rs
82+
tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
83+
tests/ui/panic-runtime/need-unwind-got-abort.rs
84+
tests/ui/panics/issue-47429-short-backtraces.rs
85+
tests/ui/panics/panic-in-cleanup.rs
86+
tests/ui/panics/panic-in-ffi.rs
87+
tests/ui/panics/runtime-switch.rs
88+
tests/ui/panics/short-ice-remove-middle-frames-2.rs
89+
tests/ui/panics/short-ice-remove-middle-frames.rs
90+
tests/ui/precondition-checks/out-of-bounds-get-unchecked.rs
91+
tests/ui/simd/masked-load-store.rs
92+
tests/ui/simd/repr_packed.rs
93+
tests/ui/type_length_limit.rs
94+
tests/ui/async-await/in-trait/dont-project-to-specializable-projection.rs
95+
tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs
96+
tests/ui/c-variadic/issue-86053-1.rs
97+
tests/ui/const-ptr/out_of_bounds_read.rs
98+
tests/ui/consts/const_unsafe_unreachable_ub.rs
99+
tests/ui/consts/miri_unleashed/drop.rs
100+
tests/ui/consts/timeout.rs
101+
tests/ui/consts/try-operator.rs
102+
tests/ui/coroutine/coroutine-resume-after-panic.rs
103+
tests/ui/coroutine/unwind-abort-mix.rs
104+
tests/ui/duplicate/dupe-symbols-7.rs
105+
tests/ui/duplicate/dupe-symbols-8.rs
106+
tests/ui/hygiene/panic-location.rs
107+
tests/ui/invalid/issue-114435-layout-type-err.rs
108+
tests/ui/invalid-compile-flags/invalid-llvm-passes.rs
109+
tests/ui/lto/issue-105637.rs
110+
tests/ui/lto/lto-duplicate-symbols.rs

tests/failing-ui-tests12.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ tests/ui/codegen/issue-79865-llvm-miscompile.rs
4242
tests/ui/std-backtrace.rs
4343
tests/ui/mir/alignment/packed.rs
4444
tests/ui/intrinsics/intrinsics-integer.rs
45+
tests/ui/asm/x86_64/evex512-implicit-feature.rs
46+
tests/ui/packed/dyn-trait.rs
47+
tests/ui/packed/issue-118537-field-offset-ice.rs
48+
tests/ui/stable-mir-print/basic_function.rs

0 commit comments

Comments
 (0)