Skip to content

Commit fbd03f8

Browse files
committed
Revert troubleshooting code
1 parent f5970eb commit fbd03f8

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

haskell-language-server.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,6 @@ test-suite wrapper-test
18111811

18121812
build-depends:
18131813
, base >=4.16 && <5
1814-
, directory
18151814
, extra
18161815
, hls-test-utils
18171816
, process

test/wrapper/Main.hs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Data.List.Extra (isInfixOf, trimEnd)
22
import Data.Maybe
3-
import System.Directory
43
import System.Environment
54
import System.Process
65
import Test.Hls
@@ -29,12 +28,6 @@ testDir dir expectedVer =
2928
withCurrentDirectoryInTmp dir $ do
3029
testExe <- fromMaybe "haskell-language-server-wrapper"
3130
<$> lookupEnv "HLS_WRAPPER_TEST_EXE"
32-
assertExecutableExists testExe
33-
cwd <- getCurrentDirectory
34-
putStrLn cwd
35-
print =<< listDirectory cwd
36-
print =<< readFile (cwd ++ "/stack.yaml")
37-
print =<< readProcess "stack" ["--stack-yaml", cwd ++ "/stack.yaml", "setup"] ""
3831
actualVer <- trimEnd <$> readProcess testExe ["--project-ghc-version"] ""
3932
actualVer @?= expectedVer
4033

@@ -43,18 +36,9 @@ testProjectType dir matcher =
4336
withCurrentDirectoryInTmp' [".stack-work", "dist"] dir $ do
4437
wrapperTestExe <- fromMaybe "haskell-language-server-wrapper"
4538
<$> lookupEnv "HLS_WRAPPER_TEST_EXE"
46-
assertExecutableExists wrapperTestExe
4739
hlsTestExe <- fromMaybe "haskell-language-server"
4840
<$> lookupEnv "HLS_TEST_EXE"
49-
assertExecutableExists hlsTestExe
5041
actualWrapperCradle <- trimEnd <$> readProcess wrapperTestExe ["--print-cradle"] ""
5142
actualHlsCradle <- trimEnd <$> readProcess hlsTestExe ["--print-cradle"] ""
5243
matcher actualWrapperCradle @? "Wrapper reported wrong project type: " ++ actualWrapperCradle
5344
matcher actualHlsCradle @? "HLS reported wrong project type: " ++ actualHlsCradle
54-
55-
assertExecutableExists :: FilePath -> IO ()
56-
assertExecutableExists exe = do
57-
mbExe <- findExecutable exe
58-
case mbExe of
59-
Nothing -> assertFailure $ "Could not find executable " ++ exe
60-
Just path -> putStrLn $ "Found " ++ exe ++ " at " ++ path

0 commit comments

Comments
 (0)