cardano-cli-test: fix windows build

IntersectMBO · Jul 25, 2023 · 885c198 · 885c198
1 parent 8364f5d
commit 885c198
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/cardano-cli/app/cardano-cli.hs b/cardano-cli/app/cardano-cli.hs
@@ -5,8 +5,6 @@
 #define UNIX
 #endif
 
-import           Cardano.CLI.OS.Posix
-
 import           Cardano.CLI.Environment (getEnvCli)
 import           Cardano.CLI.Options (opts, pref)
 import           Cardano.CLI.Run (renderClientCommandError, runClientCommand)
@@ -17,6 +15,10 @@ import           Control.Monad.Trans.Except.Exit (orDie)
 import qualified GHC.IO.Encoding as GHC
 import qualified Options.Applicative as Opt
 
+#ifdef UNIX
+import           Cardano.CLI.OS.Posix
+#endif
+
 main :: IO ()
 main = toplevelExceptionHandler $ do
   Crypto.cryptoInit

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -209,14 +209,16 @@ test-suite cardano-cli-test
                       , cardano-crypto-class ^>= 2.1
                       , cardano-slotting ^>= 0.1
                       , containers
-                      , filepath
                       , hedgehog
                       , hedgehog-extras ^>= 0.4.7.0
                       , parsec
                       , text
                       , time
                       , transformers
 
+  if !os(windows)
+    build-depends:      filepath
+
   other-modules:        Test.Cli.CliIntermediateFormat
                         Test.Cli.FilePermissions
                         Test.Cli.ITN

diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pipes.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pipes.hs
@@ -10,25 +10,27 @@ module Test.Cli.Pipes
 #define UNIX
 #endif
 
+import           Prelude
+import qualified Hedgehog as H
+import           Hedgehog (Property, discover)
+
+#ifdef UNIX
 import           Cardano.CLI.Run.Legacy.Read
 import           Cardano.CLI.OS.Posix
 
-import           Prelude
 
 import qualified Data.ByteString.Char8 as BSC
 import qualified Data.ByteString.Lazy as LBS
 import           System.FilePath ((</>))
 import           Test.Cardano.CLI.Util
 
-import           Hedgehog (Property, discover, forAll, (===))
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import           Hedgehog ((===), forAll)
 import qualified Hedgehog.Gen as G
 import           Hedgehog.Internal.Property (failWith)
 import qualified Hedgehog.Range as R
+import qualified Hedgehog.Extras.Test.Base as H
+import qualified Hedgehog.Extras.Test.File as H
 
-#ifdef UNIX
 
 prop_readFromPipe :: Property
 prop_readFromPipe = H.withTests 10 . H.property . H.moduleWorkspace "tmp" $ \ws -> do