hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stack test the easy way

Browse Source
This commit is contained in:
Nikolay Yakimov 2016-08-03 14:14:31 +03:00
parent c0732ad9cb
commit 6496b641c9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Language/Haskell/GhcMod/Utils.hs
View File

@ -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

2
test/Main.hs
View File

@ -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/"