mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove --cap-lint warn from regex test

Browse Source
This commit is contained in:
bjorn3 2023-02-26 14:27:45 +00:00
parent 7a864c8ef5
commit 5e6cde150e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_system/tests.rs
View File

@ -153,18 +153,13 @@ const fn jit_bin(config: &'static str, source: &'static str, args: &'static str)
TestCase::custom("test.regex-shootout-regex-dna", &|runner| { TestCase::custom("test.regex-shootout-regex-dna", &|runner| {
REGEX.clean(&runner.dirs); REGEX.clean(&runner.dirs);
// newer aho_corasick versions throw a deprecation warning
let lint_rust_flags = format!("{} --cap-lints warn", runner.target_compiler.rustflags);
let mut build_cmd = REGEX.build(&runner.target_compiler, &runner.dirs); let mut build_cmd = REGEX.build(&runner.target_compiler, &runner.dirs);
build_cmd.arg("--example").arg("shootout-regex-dna"); build_cmd.arg("--example").arg("shootout-regex-dna");
build_cmd.env("RUSTFLAGS", lint_rust_flags.clone());
spawn_and_wait(build_cmd); spawn_and_wait(build_cmd);
if runner.is_native { if runner.is_native {
let mut run_cmd = REGEX.run(&runner.target_compiler, &runner.dirs); let mut run_cmd = REGEX.run(&runner.target_compiler, &runner.dirs);
run_cmd.arg("--example").arg("shootout-regex-dna"); run_cmd.arg("--example").arg("shootout-regex-dna");
run_cmd.env("RUSTFLAGS", lint_rust_flags);
let input = fs::read_to_string( let input = fs::read_to_string(
REGEX.source_dir(&runner.dirs).join("examples").join("regexdna-input.txt"), REGEX.source_dir(&runner.dirs).join("examples").join("regexdna-input.txt"),
@ -197,9 +192,6 @@ const fn jit_bin(config: &'static str, source: &'static str, args: &'static str)
TestCase::custom("test.regex", &|runner| { TestCase::custom("test.regex", &|runner| {
REGEX.clean(&runner.dirs); REGEX.clean(&runner.dirs);
// newer aho_corasick versions throw a deprecation warning
let lint_rust_flags = format!("{} --cap-lints warn", runner.target_compiler.rustflags);
if runner.is_native { if runner.is_native {
let mut run_cmd = REGEX.test(&runner.target_compiler, &runner.dirs); let mut run_cmd = REGEX.test(&runner.target_compiler, &runner.dirs);
run_cmd.args([ run_cmd.args([
@ -211,13 +203,11 @@ const fn jit_bin(config: &'static str, source: &'static str, args: &'static str)
"-Zunstable-options", "-Zunstable-options",
"-q", "-q",
]); ]);
run_cmd.env("RUSTFLAGS", lint_rust_flags);
spawn_and_wait(run_cmd); spawn_and_wait(run_cmd);
} else { } else {
eprintln!("Cross-Compiling: Not running tests"); eprintln!("Cross-Compiling: Not running tests");
let mut build_cmd = REGEX.build(&runner.target_compiler, &runner.dirs); let mut build_cmd = REGEX.build(&runner.target_compiler, &runner.dirs);
build_cmd.arg("--tests"); build_cmd.arg("--tests");
build_cmd.env("RUSTFLAGS", lint_rust_flags.clone());
spawn_and_wait(build_cmd); spawn_and_wait(build_cmd);
} }
}), }),