summaryrefslogtreecommitdiff
path: root/src/Run
diff options
context:
space:
mode:
authorRoman Smrž <roman.smrz@seznam.cz>2026-10-17 11:10:40 +0200
committerRoman Smrž <roman.smrz@seznam.cz>2026-10-20 20:21:44 +0200
commit5f892bc3cd212f362b0a8f29528b783b142da8e8 (patch)
treea345cab6908eb72632684be751caf0ea1c793f1c /src/Run
parentdb6cd2706417d38b670438475c30a657ce2e5ed4 (diff)
Config option to find tool path using cabal
Changelog: Added config file option to find test tool executable via cabal.
Diffstat (limited to 'src/Run')
-rw-r--r--src/Run/Monad.hs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Run/Monad.hs b/src/Run/Monad.hs
index 8c772d5..d204f09 100644
--- a/src/Run/Monad.hs
+++ b/src/Run/Monad.hs
@@ -3,6 +3,7 @@ module Run.Monad (
TestEnv(..),
TestState(..),
TestOptions(..), defaultTestOptions,
+ ConfigTool(..),
Failed(..),
finally,
@@ -24,6 +25,7 @@ import Data.Scientific
import Data.Set (Set)
import Data.Text qualified as T
+import Config
import {-# SOURCE #-} GDB
import Network.Ip
import Output
@@ -43,6 +45,8 @@ data TestEnv = TestEnv
{ teOutput :: Output
, teFailed :: TVar (Maybe Failed)
, teOptions :: TestOptions
+ , teDefaultTool :: FilePath
+ , teProcTools :: [ ( ProcName, FilePath ) ]
, teTestDir :: FilePath
, teNextObjId :: MVar Int
, teNextProcId :: MVar Int
@@ -60,8 +64,8 @@ data TestState = TestState
}
data TestOptions = TestOptions
- { optDefaultTool :: String
- , optProcTools :: [(ProcName, String)]
+ { optDefaultTool :: ConfigTool
+ , optProcTools :: [ ( ProcName, ConfigTool ) ]
, optTestDir :: FilePath
, optTimeout :: Scientific
, optTcpdump :: Maybe FilePath
@@ -76,7 +80,7 @@ data TestOptions = TestOptions
defaultTestOptions :: TestOptions
defaultTestOptions = TestOptions
- { optDefaultTool = ""
+ { optDefaultTool = ToolPath ""
, optProcTools = []
, optTestDir = ".test"
, optTimeout = 1