mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-28 12:54:58 +00:00
fix verification on CI
remove `--verify` flag from the binaries: we have tests for this!
This commit is contained in:
parent
e40d8d4032
commit
7177fffd7b
6 changed files with 123 additions and 179 deletions
|
@ -1,7 +1,8 @@
|
|||
use std::{
|
||||
fs,
|
||||
collections::HashMap,
|
||||
path::{Path, PathBuf},
|
||||
process::{Command, Stdio},
|
||||
fs::copy,
|
||||
io::{Error, ErrorKind}
|
||||
};
|
||||
|
||||
|
@ -13,6 +14,10 @@ pub use teraron::{Mode, Overwrite, Verify};
|
|||
pub type Result<T> = std::result::Result<T, failure::Error>;
|
||||
|
||||
pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
|
||||
const GRAMMAR_DIR: &str = "crates/ra_syntax/src/grammar";
|
||||
const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/tests/data/parser/inline/ok";
|
||||
const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/tests/data/parser/inline/err";
|
||||
|
||||
pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
|
||||
pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
|
||||
const TOOLCHAIN: &str = "stable";
|
||||
|
@ -130,9 +135,9 @@ pub fn install_format_hook() -> Result<()> {
|
|||
if !result_path.exists() {
|
||||
run("cargo build --package tools --bin pre-commit", ".")?;
|
||||
if cfg!(windows) {
|
||||
copy("./target/debug/pre-commit.exe", result_path)?;
|
||||
fs::copy("./target/debug/pre-commit.exe", result_path)?;
|
||||
} else {
|
||||
copy("./target/debug/pre-commit", result_path)?;
|
||||
fs::copy("./target/debug/pre-commit", result_path)?;
|
||||
}
|
||||
} else {
|
||||
return Err(Error::new(ErrorKind::AlreadyExists, "Git hook already created").into());
|
||||
|
@ -156,3 +161,98 @@ pub fn run_fuzzer() -> Result<()> {
|
|||
"./crates/ra_syntax",
|
||||
)
|
||||
}
|
||||
|
||||
pub fn gen_tests(mode: Mode) -> Result<()> {
|
||||
let tests = tests_from_dir(&project_root().join(Path::new(GRAMMAR_DIR)))?;
|
||||
fn install_tests(tests: &HashMap<String, Test>, into: &str, mode: Mode) -> Result<()> {
|
||||
let tests_dir = project_root().join(into);
|
||||
if !tests_dir.is_dir() {
|
||||
fs::create_dir_all(&tests_dir)?;
|
||||
}
|
||||
// ok is never actually read, but it needs to be specified to create a Test in existing_tests
|
||||
let existing = existing_tests(&tests_dir, true)?;
|
||||
for t in existing.keys().filter(|&t| !tests.contains_key(t)) {
|
||||
panic!("Test is deleted: {}", t);
|
||||
}
|
||||
|
||||
let mut new_idx = existing.len() + 1;
|
||||
for (name, test) in tests {
|
||||
let path = match existing.get(name) {
|
||||
Some((path, _test)) => path.clone(),
|
||||
None => {
|
||||
let file_name = format!("{:04}_{}.rs", new_idx, name);
|
||||
new_idx += 1;
|
||||
tests_dir.join(file_name)
|
||||
}
|
||||
};
|
||||
teraron::update(&path, &test.text, mode)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
install_tests(&tests.ok, OK_INLINE_TESTS_DIR, mode)?;
|
||||
install_tests(&tests.err, ERR_INLINE_TESTS_DIR, mode)
|
||||
}
|
||||
|
||||
#[derive(Default, Debug)]
|
||||
struct Tests {
|
||||
pub ok: HashMap<String, Test>,
|
||||
pub err: HashMap<String, Test>,
|
||||
}
|
||||
|
||||
fn tests_from_dir(dir: &Path) -> Result<Tests> {
|
||||
let mut res = Tests::default();
|
||||
for entry in ::walkdir::WalkDir::new(dir) {
|
||||
let entry = entry.unwrap();
|
||||
if !entry.file_type().is_file() {
|
||||
continue;
|
||||
}
|
||||
if entry.path().extension().unwrap_or_default() != "rs" {
|
||||
continue;
|
||||
}
|
||||
process_file(&mut res, entry.path())?;
|
||||
}
|
||||
let grammar_rs = dir.parent().unwrap().join("grammar.rs");
|
||||
process_file(&mut res, &grammar_rs)?;
|
||||
return Ok(res);
|
||||
fn process_file(res: &mut Tests, path: &Path) -> Result<()> {
|
||||
let text = fs::read_to_string(path)?;
|
||||
|
||||
for (_, test) in collect_tests(&text) {
|
||||
if test.ok {
|
||||
if let Some(old_test) = res.ok.insert(test.name.clone(), test) {
|
||||
bail!("Duplicate test: {}", old_test.name)
|
||||
}
|
||||
} else {
|
||||
if let Some(old_test) = res.err.insert(test.name.clone(), test) {
|
||||
bail!("Duplicate test: {}", old_test.name)
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn existing_tests(dir: &Path, ok: bool) -> Result<HashMap<String, (PathBuf, Test)>> {
|
||||
let mut res = HashMap::new();
|
||||
for file in fs::read_dir(dir)? {
|
||||
let file = file?;
|
||||
let path = file.path();
|
||||
if path.extension().unwrap_or_default() != "rs" {
|
||||
continue;
|
||||
}
|
||||
let name = {
|
||||
let file_name = path.file_name().unwrap().to_str().unwrap();
|
||||
file_name[5..file_name.len() - 3].to_string()
|
||||
};
|
||||
let text = fs::read_to_string(&path)?;
|
||||
let test = Test {
|
||||
name: name.clone(),
|
||||
text,
|
||||
ok,
|
||||
};
|
||||
if let Some(old) = res.insert(name, (path, test)) {
|
||||
println!("Duplicate test: {:?}", old);
|
||||
}
|
||||
}
|
||||
Ok(res)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue