f

.github/docker/Dockerfile

@@ -66,7 +66,7 @@ FROM builder AS run
 LABEL vendor="QBayLogic B.V." maintainer="[email protected]"
 ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 LC_ALL=C.UTF-8 PATH="$PATH:/opt/bin:/root/.ghcup/bin"
 
-ARG DEPS_RUNTIME="gnupg pkg-config openjdk-8-jdk gdb picocom libtinfo5 libtinfo-dev build-essential curl libc6-dev libgmp10-dev python3 ccache libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2"
+ARG DEPS_RUNTIME="gnupg pkg-config openjdk-8-jdk gdb-multiarch picocom libtinfo5 libtinfo-dev build-essential curl libc6-dev libgmp10-dev python3 ccache libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2"
 RUN apt-get update \
   && apt-get install -y --no-install-recommends $DEPS_RUNTIME \
   && echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list \

.github/workflows/ci.yml

@@ -166,13 +166,6 @@ jobs:
         run: |
           ln -s /opt/bin/openocd /opt/bin/openocd-vexriscv
 
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get remove gdb -y
-          apt get install -y gdb-multiarch
-          apt-get install -y libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2
-
       - name: Run `clash-vexriscv` unittests
         run: |
           cabal run clash-vexriscv:unittests

clash-vexriscv-sim/tests/Tests/Jtag.hs

@@ -7,9 +7,11 @@ module Tests.Jtag where
 
 import Prelude
 
+import Control.Applicative ((<|>))
 import Control.Monad.Extra (ifM)
 import Data.List.Extra (trim)
 import Data.Maybe (fromJust)
+import System.Directory (findExecutable)
 import System.Exit
 import System.IO
 import System.Process
@@ -38,6 +40,14 @@ getOpenOcdCfgPath = getDataFileName "data/vexriscv_sim.cfg"
 getGdbCmdPath :: IO FilePath
 getGdbCmdPath = getDataFileName "data/vexriscv_gdb.cfg"
 
+getGdb :: HasCallStack => IO String
+getGdb = do
+  gdbMultiArch <- findExecutable "gdb-multiarch"
+  gdb <- findExecutable "gdb"
+  case gdbMultiArch <|> gdb of
+    Nothing -> fail "Neither gdb-multiarch nor gdb found in PATH"
+    Just x -> pure x
+
 expectLine :: Handle -> String -> Assertion
 expectLine h expected = do
   line <- hGetLine h
@@ -73,6 +83,7 @@ test = do
   projectRoot <- getProjectRoot
   openocdCfgPath <- getOpenOcdCfgPath
   gdbCmdPath <- getGdbCmdPath
+  gdb <- getGdb
 
   let
     vexRiscvProc = (proc simulateExecPath [printElfPath]){
@@ -85,7 +96,7 @@ test = do
       , cwd = Just projectRoot
     }
 
-    gdbProc = (proc "gdb" ["--command", gdbCmdPath]){
+    gdbProc = (proc gdb ["--command", gdbCmdPath]){
       std_out = CreatePipe, -- Comment this line to see GDB output
       cwd = Just projectRoot
     }