Fix stack test
the easy way
This commit is contained in:
parent
c0732ad9cb
commit
6496b641c9
@ -40,7 +40,7 @@ import System.IO.Temp (createTempDirectory)
|
||||
import System.Process (readProcess)
|
||||
import Text.Printf
|
||||
|
||||
import Paths_ghc_mod (getLibexecDir)
|
||||
import Paths_ghc_mod (getLibexecDir, getBinDir)
|
||||
import Utils
|
||||
import Prelude
|
||||
|
||||
@ -84,7 +84,11 @@ ghcModExecutable = do
|
||||
dir <- takeDirectory <$> getExecutablePath'
|
||||
return $ (if dir == "." then "" else dir) </> "ghc-mod"
|
||||
#else
|
||||
ghcModExecutable = fmap (</> "dist/build/ghc-mod/ghc-mod") getCurrentDirectory
|
||||
ghcModExecutable = do
|
||||
gpp <- lookupEnv "STACK_EXE"
|
||||
case gpp of
|
||||
Just _ -> fmap (</> "ghc-mod") getBinDir
|
||||
_ -> fmap (</> "dist/build/ghc-mod/ghc-mod") getCurrentDirectory
|
||||
#endif
|
||||
|
||||
getExecutablePath' :: IO FilePath
|
||||
|
@ -7,11 +7,13 @@ import Control.Monad (void)
|
||||
import Data.List
|
||||
import Language.Haskell.GhcMod (debugInfo)
|
||||
import System.Process
|
||||
import System.Environment
|
||||
import Test.Hspec
|
||||
import TestUtils
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
unsetEnv "GHC_PACKAGE_PATH"
|
||||
let sandboxes = [ "test/data/cabal-project"
|
||||
, "test/data/check-packageid"
|
||||
, "test/data/duplicate-pkgver/"
|
||||
|
Loading…
Reference in New Issue
Block a user