mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 02:57:37 +00:00
Auto merge of #6084 - ebroto:ui_tests_cleanup, r=flip1995
UI tests cleanup `@matthiaskrgr` noticed some `run-pass` annotations in some crash tests that were added in #3922. At that moment they seemed to be necessary to make the tests fail in case of an ICE, but they do not seem to be needed anymore. To test this I forced an ICE in a file with and without annotations, with and without stderr files, and the ICE makes the test fail every time. In addition, I've applied a suggestion from `@ehuss` and `@jyn514` to add `emit=metadata` to the rustc flags for the UI tests. In my machine this improved the run time from ~17 to ~12 seconds. changelog: none
This commit is contained in:
bors
commit
6e5306dcc3
@ -71,7 +71,7 @@ fn default_config() -> compiletest::Config {
|
||||
}
|
||||
|
||||
config.target_rustcflags = Some(format!(
|
||||
"-L {0} -L {1} -Dwarnings -Zui-testing {2}",
|
||||
"--emit=metadata -L {0} -L {1} -Dwarnings -Zui-testing {2}",
|
||||
host_lib().join("deps").display(),
|
||||
cargo::TARGET_LIB.join("deps").display(),
|
||||
third_party_crates(),
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
// compile-flags: --emit=link
|
||||
// no-prefer-dynamic
|
||||
|
||||
#![crate_type = "proc-macro"]
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
// compile-flags: --emit=link
|
||||
// no-prefer-dynamic
|
||||
|
||||
#![crate_type = "proc-macro"]
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/1698
|
||||
|
||||
pub trait Trait {
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
// compile-flags: --emit=link
|
||||
// no-prefer-dynamic
|
||||
// ^ compiletest by default builds all aux files as dylibs, but we don't want that for proc-macro
|
||||
// crates. If we don't set this, compiletest will override the `crate_type` attribute below and
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#[allow(dead_code)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/478
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::all)]
|
||||
#![allow(unused_imports)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(clippy::all)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/1588
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(dead_code, unused_variables)]
|
||||
|
||||
/// Should not trigger an ICE in `SpanlessEq` / `consts::constant`
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(clippy::all)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/1969
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(dead_code, clippy::char_lit_as_u8, clippy::needless_bool)]
|
||||
|
||||
/// Should not trigger an ICE in `SpanlessHash` / `consts::constant`
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(dead_code, unused_variables)]
|
||||
|
||||
/// Should not trigger an ICE in `SpanlessHash` / `consts::constant`
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/2727
|
||||
|
||||
pub fn f(new: fn()) {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(
|
||||
unused_variables,
|
||||
clippy::blacklisted_name,
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
use std::collections::HashSet;
|
||||
|
||||
// See rust-lang/rust-clippy#2774.
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/2862
|
||||
|
||||
pub trait FooMap {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#[allow(dead_code)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/2865
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/2865
|
||||
|
||||
#[derive(Clone)]
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![warn(clippy::all)]
|
||||
#![allow(clippy::blacklisted_name)]
|
||||
#![allow(unused)]
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
// aux-build:proc_macro_crash.rs
|
||||
// run-pass
|
||||
|
||||
#![warn(clippy::suspicious_else_formatting)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/3747
|
||||
|
||||
macro_rules! a {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![warn(clippy::use_self)]
|
||||
|
||||
#[path = "auxiliary/ice-4727-aux.rs"]
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
// run-pass
|
||||
const COUNT: usize = 2;
|
||||
struct Thing;
|
||||
trait Dummy {}
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::all)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/700
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::all)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/1336
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(clippy::comparison_chain)]
|
||||
#![deny(clippy::if_same_then_else)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(warnings)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/825
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(dead_code)]
|
||||
|
||||
/// Issue: https://github.com/rust-lang/rust-clippy/issues/2596
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::match_same_arms)]
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/2427
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::mut_mut, clippy::zero_ptr, clippy::cmp_nan)]
|
||||
#![allow(dead_code)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#[deny(clippy::all)]
|
||||
#[derive(Debug)]
|
||||
pub enum Error {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![deny(clippy::needless_lifetimes)]
|
||||
#![allow(dead_code)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#[macro_use]
|
||||
extern crate clippy_mini_macro_test;
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(clippy::blacklisted_name)]
|
||||
|
||||
pub fn foo(bar: *const u8) {
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
/// Test for https://github.com/rust-lang/rust-clippy/issues/1346
|
||||
|
||||
#[deny(warnings)]
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![warn(clippy::single_match_else)]
|
||||
|
||||
//! Test for https://github.com/rust-lang/rust-clippy/issues/1588
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![feature(trivial_bounds)]
|
||||
#![allow(unused, trivial_bounds)]
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
// run-pass
|
||||
|
||||
#![allow(clippy::useless_attribute)] //issue #2910
|
||||
|
||||
#[macro_use]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user