fn default_config() -> compiletest::Config {
let mut config = compiletest::Config::default();
- if let Ok(name) = env::var("TESTNAME") {
- config.filter = Some(name);
+ if let Ok(filters) = env::var("TESTNAME") {
+ config.filters = filters.split(',').map(std::string::ToString::to_string).collect();
}
if let Some(path) = option_env!("RUSTC_LIB_PATH") {
fn run_mode(cfg: &mut compiletest::Config) {
cfg.mode = TestMode::Ui;
cfg.src_base = Path::new("tests").join("ui");
- compiletest::run_tests(&cfg);
+ compiletest::run_tests(cfg);
}
fn run_internal_tests(cfg: &mut compiletest::Config) {
}
cfg.mode = TestMode::Ui;
cfg.src_base = Path::new("tests").join("ui-internal");
- compiletest::run_tests(&cfg);
+ compiletest::run_tests(cfg);
}
fn run_ui_toml(config: &mut compiletest::Config) {
base: config.src_base.clone(),
relative_dir: dir_path.file_name().unwrap().into(),
};
- let test_name = compiletest::make_test_name(&config, &paths);
+ let test_name = compiletest::make_test_name(config, &paths);
let index = tests
.iter()
.position(|test| test.desc.name == test_name)
config.mode = TestMode::Ui;
config.src_base = Path::new("tests").join("ui-toml").canonicalize().unwrap();
- let tests = compiletest::make_tests(&config);
+ let tests = compiletest::make_tests(config);
let manifest_dir = var("CARGO_MANIFEST_DIR").unwrap_or_default();
- let res = run_tests(&config, tests);
+ let res = run_tests(config, tests);
set_var("CARGO_MANIFEST_DIR", &manifest_dir);
match res {
Ok(true) => {},
fn run_ui_cargo(config: &mut compiletest::Config) {
fn run_tests(
config: &compiletest::Config,
- filter: &Option<String>,
+ filters: &[String],
mut tests: Vec<tester::TestDescAndFn>,
) -> Result<bool, io::Error> {
let mut result = true;
// Use the filter if provided
let dir_path = dir.path();
- match &filter {
- Some(name) if !dir_path.ends_with(name) => continue,
- _ => {},
+ for filter in filters {
+ if !dir_path.ends_with(filter) {
+ continue;
+ }
}
for case in fs::read_dir(&dir_path)? {
Some("main.rs") => {},
_ => continue,
}
+ set_var("CLIPPY_CONF_DIR", case.path());
let paths = compiletest::common::TestPaths {
file: file_path,
base: config.src_base.clone(),
relative_dir: src_path.strip_prefix(&config.src_base).unwrap().into(),
};
- let test_name = compiletest::make_test_name(&config, &paths);
+ let test_name = compiletest::make_test_name(config, &paths);
let index = tests
.iter()
.position(|test| test.desc.name == test_name)
config.mode = TestMode::Ui;
config.src_base = Path::new("tests").join("ui-cargo").canonicalize().unwrap();
- let tests = compiletest::make_tests(&config);
+ let tests = compiletest::make_tests(config);
let current_dir = env::current_dir().unwrap();
- let filter = env::var("TESTNAME").ok();
- let res = run_tests(&config, &filter, tests);
+ let conf_dir = var("CLIPPY_CONF_DIR").unwrap_or_default();
+ let res = run_tests(config, &config.filters, tests);
env::set_current_dir(current_dir).unwrap();
+ set_var("CLIPPY_CONF_DIR", conf_dir);
match res {
Ok(true) => {},
fn prepare_env() {
set_var("CLIPPY_DISABLE_DOCS_LINKS", "true");
- set_var("CLIPPY_TESTS", "true");
+ set_var("__CLIPPY_INTERNAL_TESTS", "true");
//set_var("RUST_BACKTRACE", "0");
}