language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

split out valgrind reporting code

Browse source
This commit is contained in:
Folkert 2022-12-30 14:54:24 +01:00
parent ecfc7b65e7
commit f54b1f577c
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 76 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/cli_utils/src/helpers.rs
View file

@ -251,10 +251,10 @@ pub fn run_with_valgrind<'a, I: IntoIterator<Item = &'a str>>(
let mut cmd = Command::new("valgrind");
let named_tempfile =
NamedTempFile::new().expect("Unable to create tempfile for valgrind results");
let filepath = named_tempfile.path().to_str().unwrap();
cmd.arg("--tool=memcheck");
cmd.arg("--xml=yes");
cmd.arg(format!("--xml-file={}", named_tempfile.path().display()));
// If you are having valgrind issues on MacOS, you may need to suppress some
// of the errors. Read more here: https://github.com/roc-lang/roc/issues/746
@ -274,8 +274,6 @@ pub fn run_with_valgrind<'a, I: IntoIterator<Item = &'a str>>(
}
}
cmd.arg(format!("--xml-file={}", filepath));
for arg in args {
cmd.arg(arg);
}

118
crates/valgrind/src/lib.rs
View file

@ -16,7 +16,6 @@ fn valgrind_test(source: &str) {
#[cfg(target_os = "linux")]
fn valgrind_test_linux(source: &str) {
use cli_utils::helpers::{extract_valgrind_errors, ValgrindError, ValgrindErrorXWhat};
use roc_cli::build::BuiltFile;
let pf = std::env::current_dir()
@ -66,49 +65,8 @@ fn valgrind_test_linux(source: &str) {
if problems.exit_code() != 0 {
panic!("there are problems")
}
// If possible, report the generated executable name relative to the current dir.
let generated_filename = binary_path
.strip_prefix(std::env::current_dir().unwrap())
.unwrap_or(&binary_path)
.to_str()
.unwrap();
let (valgrind_out, raw_xml) =
cli_utils::helpers::run_with_valgrind([], &[generated_filename.to_string()]);
if valgrind_out.status.success() {
let memory_errors = extract_valgrind_errors(&raw_xml).unwrap_or_else(|err| {
panic!("failed to parse the `valgrind` xml output:\n\n Error was:\n\n {:?}\n\n valgrind xml was:\n\n \"{}\"\n\n valgrind stdout was:\n\n \"{}\"\n\n valgrind stderr was:\n\n \"{}\"", err, raw_xml, valgrind_out.stdout, valgrind_out.stderr);
});
if !memory_errors.is_empty() {
for error in memory_errors {
let ValgrindError {
kind,
what: _,
xwhat,
} = error;
println!("Valgrind Error: {}\n", kind);
if let Some(ValgrindErrorXWhat {
text,
leakedbytes: _,
leakedblocks: _,
}) = xwhat
{
println!(" {}", text);
}
}
panic!("Valgrind found memory errors in {:?}", app_module_path);
}
} else {
let exit_code = match valgrind_out.status.code() {
Some(code) => format!("exit code {}", code),
None => "no exit code".to_string(),
};
panic!("`valgrind` exited with {}. valgrind stdout was: \"{}\"\n\nvalgrind stderr was: \"{}\"", exit_code, valgrind_out.stdout, valgrind_out.stderr);
}
run_with_valgrind(&binary_path);
}
Err(e) => panic!("{:?}", e),
}
@ -116,6 +74,80 @@ fn valgrind_test_linux(source: &str) {
drop(temp_dir)
}
fn run_with_valgrind(binary_path: &std::path::Path) {
use cli_utils::helpers::{extract_valgrind_errors, ValgrindError, ValgrindErrorXWhat};
// If possible, report the generated executable name relative to the current dir.
let generated_filename = binary_path
.strip_prefix(std::env::current_dir().unwrap())
.unwrap_or(binary_path)
.to_str()
.unwrap();
let (valgrind_out, raw_xml) =
cli_utils::helpers::run_with_valgrind([], &[generated_filename.to_string()]);
if valgrind_out.status.success() {
let memory_errors = extract_valgrind_errors(&raw_xml).unwrap_or_else(|err| {
panic!(
indoc!(
r#"
failed to parse the `valgrind` xml output:
Error was:
{:?}
valgrind xml was:
{}
valgrind stdout was:
{}
valgrind stderr was:
{}
"#
),
err, raw_xml, valgrind_out.stdout, valgrind_out.stderr
);
});
if !memory_errors.is_empty() {
for error in memory_errors {
let ValgrindError {
kind,
what: _,
xwhat,
} = error;
println!("Valgrind Error: {}\n", kind);
if let Some(ValgrindErrorXWhat {
text,
leakedbytes: _,
leakedblocks: _,
}) = xwhat
{
println!(" {}", text);
}
}
panic!("Valgrind found memory errors");
}
} else {
let exit_code = match valgrind_out.status.code() {
Some(code) => format!("exit code {}", code),
None => "no exit code".to_string(),
};
panic!(
"`valgrind` exited with {}. valgrind stdout was: \"{}\"\n\nvalgrind stderr was: \"{}\"",
exit_code, valgrind_out.stdout, valgrind_out.stderr
);
}
}
#[test]
fn list_concat_consumes_first_argument() {
valgrind_test("List.concat (List.withCapacity 1024) [1,2,3] |> List.len |> Num.toStr");