Fix tests

5 files changed, 59 insertions, 49 deletions

diff --git a/build_system/src/prepare.rs b/build_system/src/prepare.rs
index 1a3eb7d2e57..66f440f5355 100644
--- a/build_system/src/prepare.rs
+++ b/build_system/src/prepare.rs
@@ -159,21 +159,6 @@ where
     let repo_path = Path::new(crate::BUILD_DIR).join(&clone_result.repo_name);
     run_command(&[&"git", &"checkout", &"--", &"."], Some(&repo_path))?;
     run_command(&[&"git", &"checkout", &checkout_commit], Some(&repo_path))?;
-    let filter = format!("-{}-", clone_result.repo_name);
-    walk_dir(
-        "patches/crate_patches",
-        |_| Ok(()),
-        |file_path| {
-            let patch = file_path.as_os_str().to_str().unwrap();
-            if patch.contains(&filter) && patch.ends_with(".patch") {
-                run_command_with_output(
-                    &[&"git", &"am", &file_path.canonicalize().unwrap()],
-                    Some(&repo_path),
-                )?;
-            }
-            Ok(())
-        },
-    )?;
     if let Some(extra) = extra {
         extra(&repo_path)?;
     }
@@ -238,7 +223,7 @@ pub fn run() -> Result<(), String> {
         let to_clone = &[
             (
                 "https://github.com/rust-random/rand.git",
-                "0f933f9c7176e53b2a3c7952ded484e1783f0bf1",
+                "1f4507a8e1cf8050e4ceef95eeda8f64645b6719",
                 None,
             ),
             (
diff --git a/patches/crate_patches/0002-rand-Disable-failing-test.patch b/patches/crate_patches/0002-rand-Disable-failing-test.patch
deleted file mode 100644
index 449ca5f6e29..00000000000
--- a/patches/crate_patches/0002-rand-Disable-failing-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a8fb97120d71252538b6b026695df40d02696bdb Mon Sep 17 00:00:00 2001
-From: bjorn3 <bjorn3@users.noreply.github.com>
-Date: Sat, 15 Aug 2020 20:04:38 +0200
-Subject: [PATCH] [rand] Disable failing test
-
----
- src/distributions/uniform.rs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/distributions/uniform.rs b/src/distributions/uniform.rs
-index 480b859..c80bb6f 100644
---- a/src/distributions/uniform.rs
-+++ b/src/distributions/uniform.rs
-@@ -1085,7 +1085,7 @@ mod tests {
-             _ => panic!("`UniformDurationMode` was not serialized/deserialized correctly")
-         }
-     }
--    
-+
-     #[test]
-     #[cfg(feature = "serde1")]
-     fn test_uniform_serialization() {
-@@ -1314,6 +1314,7 @@ mod tests {
-         not(target_arch = "wasm32"),
-         not(target_arch = "asmjs")
-     ))]
-+    #[ignore] // FIXME
-     fn test_float_assertions() {
-         use super::SampleUniform;
-         use std::panic::catch_unwind;
--- 
-2.20.1
diff --git a/tests/failing-lto-tests.txt b/tests/failing-lto-tests.txt
index 2e0b6134070..8de45ae0f28 100644
--- a/tests/failing-lto-tests.txt
+++ b/tests/failing-lto-tests.txt
@@ -1,6 +1,6 @@
 tests/ui/lint/unsafe_code/forge_unsafe_block.rs
 tests/ui/lint/unused-qualification-in-derive-expansion.rs
-tests/ui/macro-quote-test.rs
+tests/ui/macros/macro-quote-test.rs
 tests/ui/macros/proc_macro.rs
 tests/ui/panic-runtime/lto-unwind.rs
 tests/ui/resolve/derive-macro-1.rs
@@ -21,3 +21,17 @@ tests/ui/fmt/format-args-capture-issue-106408.rs
 tests/ui/fmt/indoc-issue-106408.rs
 tests/ui/hygiene/issue-77523-def-site-async-await.rs
 tests/ui/inherent-impls-overlap-check/no-overlap.rs
+tests/ui/annotate-snippet/multispan.rs
+tests/ui/enum-discriminant/issue-46519.rs
+tests/ui/issues/issue-45731.rs
+tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
+tests/ui/macros/macro-comma-behavior-rpass.rs
+tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
+tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
+tests/ui/macros/stringify.rs
+tests/ui/panics/test-panic.rs
+tests/ui/panics/test-should-fail-bad-message.rs
+tests/ui/panics/test-should-panic-bad-message.rs
+tests/ui/panics/test-should-panic-no-message.rs
+tests/ui/reexport-test-harness-main.rs
+tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs
diff --git a/tests/failing-ui-tests.txt b/tests/failing-ui-tests.txt
index 6e020e9b354..e504021bf2a 100644
--- a/tests/failing-ui-tests.txt
+++ b/tests/failing-ui-tests.txt
@@ -69,3 +69,42 @@ tests/ui/async-await/deep-futures-are-freeze.rs
 tests/ui/closures/capture-unsized-by-ref.rs
 tests/ui/coroutine/resume-after-return.rs
 tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
+tests/ui/limits/issue-17913.rs
+tests/ui/limits/issue-55878.rs
+tests/ui/linkage-attr/common-linkage-non-zero-init.rs
+tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
+tests/ui/numbers-arithmetic/divide-by-zero.rs
+tests/ui/numbers-arithmetic/mod-zero.rs
+tests/ui/numbers-arithmetic/overflowing-neg-nonzero.rs
+tests/ui/numbers-arithmetic/overflowing-neg.rs
+tests/ui/optimization-remark.rs
+tests/ui/panic-handler/panic-handler-std.rs
+tests/ui/panic-runtime/abort-link-to-unwind-dylib.rs
+tests/ui/panic-runtime/need-unwind-got-abort.rs
+tests/ui/panics/issue-47429-short-backtraces.rs
+tests/ui/panics/panic-in-cleanup.rs
+tests/ui/panics/panic-in-ffi.rs
+tests/ui/panics/runtime-switch.rs
+tests/ui/panics/short-ice-remove-middle-frames-2.rs
+tests/ui/panics/short-ice-remove-middle-frames.rs
+tests/ui/precondition-checks/out-of-bounds-get-unchecked.rs
+tests/ui/simd/masked-load-store.rs
+tests/ui/simd/repr_packed.rs
+tests/ui/type_length_limit.rs
+tests/ui/async-await/in-trait/dont-project-to-specializable-projection.rs
+tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs
+tests/ui/c-variadic/issue-86053-1.rs
+tests/ui/const-ptr/out_of_bounds_read.rs
+tests/ui/consts/const_unsafe_unreachable_ub.rs
+tests/ui/consts/miri_unleashed/drop.rs
+tests/ui/consts/timeout.rs
+tests/ui/consts/try-operator.rs
+tests/ui/coroutine/coroutine-resume-after-panic.rs
+tests/ui/coroutine/unwind-abort-mix.rs
+tests/ui/duplicate/dupe-symbols-7.rs
+tests/ui/duplicate/dupe-symbols-8.rs
+tests/ui/hygiene/panic-location.rs
+tests/ui/invalid/issue-114435-layout-type-err.rs
+tests/ui/invalid-compile-flags/invalid-llvm-passes.rs
+tests/ui/lto/issue-105637.rs
+tests/ui/lto/lto-duplicate-symbols.rs
diff --git a/tests/failing-ui-tests12.txt b/tests/failing-ui-tests12.txt
index 64f89b03eec..1d9bdaa552c 100644
--- a/tests/failing-ui-tests12.txt
+++ b/tests/failing-ui-tests12.txt
@@ -42,3 +42,7 @@ tests/ui/codegen/issue-79865-llvm-miscompile.rs
 tests/ui/std-backtrace.rs
 tests/ui/mir/alignment/packed.rs
 tests/ui/intrinsics/intrinsics-integer.rs
+tests/ui/asm/x86_64/evex512-implicit-feature.rs
+tests/ui/packed/dyn-trait.rs
+tests/ui/packed/issue-118537-field-offset-ice.rs
+tests/ui/stable-mir-print/basic_function.rs