From b81aed852a2796091633a0f92c580616dfdb642c Mon Sep 17 00:00:00 2001
From: Folkert <folkert@folkertdev.nl>
Date: Fri, 23 Dec 2022 19:17:28 +0100
Subject: [PATCH] properly display valgrind problems

---
 crates/cli/src/lib.rs      |  1 -
 crates/valgrind/src/lib.rs | 51 +++++++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
index a0bdcb5381..6d48900d05 100644
--- a/crates/cli/src/lib.rs
+++ b/crates/cli/src/lib.rs
@@ -13,7 +13,6 @@ use roc_load::{ExpectMetadata, LoadingProblem, Threading};
 use roc_mono::ir::OptLevel;
 use roc_packaging::cache::RocCacheDir;
 use roc_packaging::tarball::Compression;
-use roc_reporting::cli::Problems;
 use std::env;
 use std::ffi::{CString, OsStr};
 use std::io;
diff --git a/crates/valgrind/src/lib.rs b/crates/valgrind/src/lib.rs
index 2c2c37c27b..b60003b46a 100644
--- a/crates/valgrind/src/lib.rs
+++ b/crates/valgrind/src/lib.rs
@@ -5,6 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use cli_utils::helpers::{extract_valgrind_errors, ValgrindError, ValgrindErrorXWhat};
 use roc_build::{
     link::{LinkType, LinkingStrategy},
     program::{CodeGenBackend, CodeGenOptions},
@@ -13,13 +14,6 @@ use roc_cli::build::{BuildOrdering, BuiltFile};
 use roc_load::Threading;
 use roc_mono::ir::OptLevel;
 
-fn list_files(dir: &std::path::Path) -> std::vec::Vec<PathBuf> {
-    std::fs::read_dir(dir)
-        .unwrap()
-        .map(|f| PathBuf::from(f.unwrap().file_name()))
-        .collect::<std::vec::Vec<_>>()
-}
-
 fn run_example(app_module_path: impl AsRef<Path>) {
     let app_module_path = app_module_path.as_ref();
 
@@ -73,14 +67,41 @@ fn run_example(app_module_path: impl AsRef<Path>) {
                 .to_str()
                 .unwrap();
 
-            let (out, _raw_xml) =
+            let (valgrind_out, raw_xml) =
                 cli_utils::helpers::run_with_valgrind([], &[generated_filename.to_string()]);
 
-            if !out.status.success() {
-                panic!(
-                    "Running the application `{:?}` failed!\n\n{}\n\n{}",
-                    out.cmd_str, out.stdout, out.stderr
-                );
+            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);
             }
         }
         Err(e) => panic!("{:?}", e),
@@ -88,7 +109,7 @@ fn run_example(app_module_path: impl AsRef<Path>) {
 }
 
 #[test]
-fn it_works() {
+fn run_valgrind_tests() {
     for dir_entry in std::fs::read_dir("tests").unwrap() {
         let path = dir_entry.unwrap().path();
 
@@ -96,6 +117,8 @@ fn it_works() {
             continue;
         }
 
+        println!("test file: {:?}\n", &path);
+
         run_example(path);
     }
 }