#![feature(test)] // compiletest_rs requires this attribute
#![feature(once_cell)]
+#![feature(is_sorted)]
#![cfg_attr(feature = "deny-warnings", deny(warnings))]
#![warn(rust_2018_idioms, unused_lifetimes)]
use std::ffi::{OsStr, OsString};
use std::fs;
use std::io;
+use std::lazy::SyncLazy;
use std::path::{Path, PathBuf};
use test_utils::IS_RUSTC_TEST_SUITE;
/// All crates used in UI tests are listed here
static TEST_DEPENDENCIES: &[&str] = &[
+ "clap",
"clippy_utils",
"derive_new",
"futures",
"syn",
"tokio",
"parking_lot",
+ "rustc_semver",
];
// Test dependencies may need an `extern crate` here to ensure that they show up
// in the depinfo file (otherwise cargo thinks they are unused)
#[allow(unused_extern_crates)]
+extern crate clap;
+#[allow(unused_extern_crates)]
extern crate clippy_utils;
#[allow(unused_extern_crates)]
extern crate derive_new;
#[allow(unused_extern_crates)]
extern crate quote;
#[allow(unused_extern_crates)]
+extern crate rustc_semver;
+#[allow(unused_extern_crates)]
extern crate syn;
#[allow(unused_extern_crates)]
extern crate tokio;
/// dependencies must be added to Cargo.toml at the project root. Test
/// dependencies that are not *directly* used by this test module require an
/// `extern crate` declaration.
-fn extern_flags() -> String {
+static EXTERN_FLAGS: SyncLazy<String> = SyncLazy::new(|| {
let current_exe_depinfo = {
let mut path = env::current_exe().unwrap();
path.set_extension("d");
- std::fs::read_to_string(path).unwrap()
+ fs::read_to_string(path).unwrap()
};
let mut crates: HashMap<&str, &str> = HashMap::with_capacity(TEST_DEPENDENCIES.len());
for line in current_exe_depinfo.lines() {
not_found.is_empty(),
"dependencies not found in depinfo: {:?}\n\
help: Make sure the `-Z binary-dep-depinfo` rust flag is enabled\n\
- help: Try adding to dev-dependencies in Cargo.toml",
- not_found
+ help: Try adding to dev-dependencies in Cargo.toml\n\
+ help: Be sure to also add `extern crate ...;` to tests/compile-test.rs",
+ not_found,
);
crates
.into_iter()
.map(|(name, path)| format!(" --extern {}={}", name, path))
.collect()
-}
+});
-fn default_config() -> compiletest::Config {
+fn base_config(test_dir: &str) -> compiletest::Config {
let mut config = compiletest::Config {
edition: Some("2021".into()),
+ mode: TestMode::Ui,
..compiletest::Config::default()
};
if let Ok(filters) = env::var("TESTNAME") {
- config.filters = filters.split(',').map(std::string::ToString::to_string).collect();
+ config.filters = filters.split(',').map(ToString::to_string).collect();
}
if let Some(path) = option_env!("RUSTC_LIB_PATH") {
config.run_lib_path = path.clone();
config.compile_lib_path = path;
}
- let current_exe_path = std::env::current_exe().unwrap();
+ let current_exe_path = env::current_exe().unwrap();
let deps_path = current_exe_path.parent().unwrap();
let profile_path = deps_path.parent().unwrap();
"--emit=metadata -Dwarnings -Zui-testing -L dependency={}{}{}",
deps_path.display(),
host_libs,
- extern_flags(),
+ &*EXTERN_FLAGS,
));
- config.build_base = profile_path.join("test");
+ config.src_base = Path::new("tests").join(test_dir);
+ config.build_base = profile_path.join("test").join(test_dir);
config.rustc_path = profile_path.join(if cfg!(windows) {
"clippy-driver.exe"
} else {
config
}
-fn run_ui(cfg: &mut compiletest::Config) {
- cfg.mode = TestMode::Ui;
- cfg.src_base = Path::new("tests").join("ui");
+fn run_ui() {
+ let mut config = base_config("ui");
+ config.rustfix_coverage = true;
// use tests/clippy.toml
- let _g = VarGuard::set("CARGO_MANIFEST_DIR", std::fs::canonicalize("tests").unwrap());
- compiletest::run_tests(cfg);
-}
-
-fn run_ui_test(cfg: &mut compiletest::Config) {
- cfg.mode = TestMode::Ui;
- cfg.src_base = Path::new("tests").join("ui_test");
- let _g = VarGuard::set("CARGO_MANIFEST_DIR", std::fs::canonicalize("tests").unwrap());
- let rustcflags = cfg.target_rustcflags.get_or_insert_with(Default::default);
- let len = rustcflags.len();
- rustcflags.push_str(" --test");
- compiletest::run_tests(cfg);
- if let Some(ref mut flags) = &mut cfg.target_rustcflags {
- flags.truncate(len);
- }
+ let _g = VarGuard::set("CARGO_MANIFEST_DIR", fs::canonicalize("tests").unwrap());
+ let _threads = VarGuard::set(
+ "RUST_TEST_THREADS",
+ // if RUST_TEST_THREADS is set, adhere to it, otherwise override it
+ env::var("RUST_TEST_THREADS").unwrap_or_else(|_| {
+ std::thread::available_parallelism()
+ .map_or(1, std::num::NonZeroUsize::get)
+ .to_string()
+ }),
+ );
+ compiletest::run_tests(&config);
+ check_rustfix_coverage();
}
-fn run_internal_tests(cfg: &mut compiletest::Config) {
+fn run_internal_tests() {
// only run internal tests with the internal-tests feature
if !RUN_INTERNAL_TESTS {
return;
}
- cfg.mode = TestMode::Ui;
- cfg.src_base = Path::new("tests").join("ui-internal");
- compiletest::run_tests(cfg);
+ let config = base_config("ui-internal");
+ compiletest::run_tests(&config);
}
-fn run_ui_toml(config: &mut compiletest::Config) {
+fn run_ui_toml() {
fn run_tests(config: &compiletest::Config, mut tests: Vec<tester::TestDescAndFn>) -> Result<bool, io::Error> {
let mut result = true;
let opts = compiletest::test_opts(config);
Ok(result)
}
- config.mode = TestMode::Ui;
- config.src_base = Path::new("tests").join("ui-toml").canonicalize().unwrap();
+ let mut config = base_config("ui-toml");
+ config.src_base = config.src_base.canonicalize().unwrap();
- let tests = compiletest::make_tests(config);
+ let tests = compiletest::make_tests(&config);
- let res = run_tests(config, tests);
+ let res = run_tests(&config, tests);
match res {
Ok(true) => {},
Ok(false) => panic!("Some tests failed"),
}
}
-fn run_ui_cargo(config: &mut compiletest::Config) {
+fn run_ui_cargo() {
fn run_tests(
config: &compiletest::Config,
filters: &[String],
return;
}
- config.mode = TestMode::Ui;
- config.src_base = Path::new("tests").join("ui-cargo").canonicalize().unwrap();
+ let mut config = base_config("ui-cargo");
+ config.src_base = config.src_base.canonicalize().unwrap();
- let tests = compiletest::make_tests(config);
+ let tests = compiletest::make_tests(&config);
let current_dir = env::current_dir().unwrap();
- let res = run_tests(config, &config.filters, tests);
+ let res = run_tests(&config, &config.filters, tests);
env::set_current_dir(current_dir).unwrap();
match res {
}
}
-fn prepare_env() {
+#[test]
+fn compile_test() {
set_var("CLIPPY_DISABLE_DOCS_LINKS", "true");
- set_var("__CLIPPY_INTERNAL_TESTS", "true");
- //set_var("RUST_BACKTRACE", "0");
+ run_ui();
+ run_ui_toml();
+ run_ui_cargo();
+ run_internal_tests();
+}
+
+const RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS: &[&str] = &[
+ "assign_ops2.rs",
+ "borrow_deref_ref_unfixable.rs",
+ "cast_size_32bit.rs",
+ "char_lit_as_u8.rs",
+ "cmp_owned/without_suggestion.rs",
+ "dbg_macro.rs",
+ "deref_addrof_double_trigger.rs",
+ "doc/unbalanced_ticks.rs",
+ "eprint_with_newline.rs",
+ "explicit_counter_loop.rs",
+ "iter_skip_next_unfixable.rs",
+ "let_and_return.rs",
+ "literals.rs",
+ "map_flatten.rs",
+ "map_unwrap_or.rs",
+ "match_bool.rs",
+ "mem_replace_macro.rs",
+ "needless_arbitrary_self_type_unfixable.rs",
+ "needless_borrow_pat.rs",
+ "needless_for_each_unfixable.rs",
+ "nonminimal_bool.rs",
+ "print_literal.rs",
+ "print_with_newline.rs",
+ "redundant_static_lifetimes_multiple.rs",
+ "ref_binding_to_reference.rs",
+ "repl_uninit.rs",
+ "result_map_unit_fn_unfixable.rs",
+ "search_is_some.rs",
+ "single_component_path_imports_nested_first.rs",
+ "string_add.rs",
+ "toplevel_ref_arg_non_rustfix.rs",
+ "unit_arg.rs",
+ "unnecessary_clone.rs",
+ "unnecessary_lazy_eval_unfixable.rs",
+ "write_literal.rs",
+ "write_literal_2.rs",
+ "write_with_newline.rs",
+];
+
+fn check_rustfix_coverage() {
+ let missing_coverage_path = Path::new("target/debug/test/ui/rustfix_missing_coverage.txt");
+
+ if let Ok(missing_coverage_contents) = std::fs::read_to_string(missing_coverage_path) {
+ assert!(RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS.iter().is_sorted_by_key(Path::new));
+
+ for rs_path in missing_coverage_contents.lines() {
+ if Path::new(rs_path).starts_with("tests/ui/crashes") {
+ continue;
+ }
+ let filename = Path::new(rs_path).strip_prefix("tests/ui/").unwrap();
+ assert!(
+ RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS
+ .binary_search_by_key(&filename, Path::new)
+ .is_ok(),
+ "`{}` runs `MachineApplicable` diagnostics but is missing a `run-rustfix` annotation. \
+ Please either add `// run-rustfix` at the top of the file or add the file to \
+ `RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS` in `tests/compile-test.rs`.",
+ rs_path,
+ );
+ }
+ }
}
#[test]
-fn compile_test() {
- prepare_env();
- let mut config = default_config();
- run_ui(&mut config);
- run_ui_test(&mut config);
- run_ui_toml(&mut config);
- run_ui_cargo(&mut config);
- run_internal_tests(&mut config);
+fn rustfix_coverage_known_exceptions_accuracy() {
+ for filename in RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS {
+ let rs_path = Path::new("tests/ui").join(filename);
+ assert!(
+ rs_path.exists(),
+ "`{}` does not exists",
+ rs_path.strip_prefix(env!("CARGO_MANIFEST_DIR")).unwrap().display()
+ );
+ let fixed_path = rs_path.with_extension("fixed");
+ assert!(
+ !fixed_path.exists(),
+ "`{}` exists",
+ fixed_path.strip_prefix(env!("CARGO_MANIFEST_DIR")).unwrap().display()
+ );
+ }
}
/// Restores an env var on drop
projects / rust.git / blobdiff