From a5de09a4e12984755a4167c684af5417cb4e1ff5 Mon Sep 17 00:00:00 2001
From: Lucas Bollen <lucas@qbaylogic.com>
Date: Thu, 23 Jan 2025 11:21:13 +0100
Subject: [PATCH] Add openocd logging to `vexRiscvTcpTest`

---
 .../Instances/Hitl/Driver/VexRiscvTcp.hs      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/bittide-instances/src/Bittide/Instances/Hitl/Driver/VexRiscvTcp.hs b/bittide-instances/src/Bittide/Instances/Hitl/Driver/VexRiscvTcp.hs
index 0140781de..cac14a453 100644
--- a/bittide-instances/src/Bittide/Instances/Hitl/Driver/VexRiscvTcp.hs
+++ b/bittide-instances/src/Bittide/Instances/Hitl/Driver/VexRiscvTcp.hs
@@ -80,8 +80,12 @@ driverFunc _name [(hwT, dI)] = do
 
   let
     hitlDir = projectDir </> "_build" </> "hitl"
-    stdoutLog = hitlDir </> "picocom-stdout.log"
-    stderrLog = hitlDir </> "picocom-stderr.log"
+    mkLogPath name = (hitlDir </> name <> ".log")
+    picoOutLog = mkLogPath "picocom-stdout"
+    picoErrLog = mkLogPath "picocom-stderr"
+    ocdOutLog = mkLogPath "openocd-stdout"
+    ocdErrLog = mkLogPath "openocd-stderr"
+    openocdEnv = [("OPENOCD_STDOUT_LOG", ocdOutLog), ("OPENOCD_STDERR_LOG", ocdErrLog)]
 
     initHwDevice = do
       openHardwareTarget hwT
@@ -142,11 +146,11 @@ driverFunc _name [(hwT, dI)] = do
 
   initHwDevice
 
-  withOpenOcd dI.usbAdapterLocation 3333 6666 4444 $ \ocd -> do
+  withOpenOcdWithEnv openocdEnv dI.usbAdapterLocation 3333 6666 4444 $ \ocd -> do
     liftIO $ initOpenOcd ocd
 
     liftIO $ putStrLn "Starting Picocom..."
-    withPicocomWithLogging dI.serial stdoutLog stderrLog $ \pico -> do
+    withPicocomWithLogging dI.serial picoOutLog picoErrLog $ \pico -> do
       liftIO $ initPicocom pico
 
       liftIO $ putStrLn "Starting GDB..."
@@ -234,10 +238,10 @@ case_testTcpClient = do
       projectDir <- findParentContaining "cabal.project"
       let
         hitlDir = projectDir </> "_build" </> "hitl"
-        stdoutLog = hitlDir </> "picocom-stdout.log"
-        stderrLog = hitlDir </> "picocom-stderr.log"
-      putStrLn $ "logging stdout to `" <> stdoutLog <> "`"
-      putStrLn $ "logging stderr to `" <> stderrLog <> "`"
+        picoOutLog = hitlDir </> "picocom-stdout.log"
+        picoErrLog = hitlDir </> "picocom-stderr.log"
+      putStrLn $ "logging stdout to `" <> picoOutLog <> "`"
+      putStrLn $ "logging stderr to `" <> picoErrLog <> "`"
       let
         openOcdProc =
           (proc startOpenOcdPath [])
@@ -256,7 +260,7 @@ case_testTcpClient = do
             , new_session = True
             , env =
                 Just
-                  (currentEnv <> [("PICOCOM_STDOUT_LOG", stdoutLog), ("PICOCOM_STDERR_LOG", stderrLog)])
+                  (currentEnv <> [("PICOCOM_STDOUT_LOG", picoOutLog), ("PICOCOM_STDERR_LOG", picoErrLog)])
             }
 
       putStrLn "Starting OpenOcd..."