Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set the root for tests to the test directory #3830

Merged
merged 2 commits into from
Oct 28, 2023
Merged

Set the root for tests to the test directory #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2747a15
Set the root for tests to the test directory
fendor Oct 6, 2023
be15be6
Merge branch 'master' into enhance/integration-tests-perf
fendor Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ghcide/session-loader/Development/IDE/Session.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ loadWithImplicitCradle mHieYaml rootDir = do

getInitialGhcLibDirDefault :: Recorder (WithPriority Log) -> FilePath -> IO (Maybe LibDir)
getInitialGhcLibDirDefault recorder rootDir = do
hieYaml <- findCradle def rootDir
hieYaml <- findCradle def (rootDir </> "a")
fendor marked this conversation as resolved.
Show resolved Hide resolved
cradle <- loadCradle def hieYaml rootDir
libDirRes <- getRuntimeGhcLibDir (toCologActionWithPrio (cmapWithPrio LogHieBios recorder)) cradle
case libDirRes of
Expand Down
1 change: 1 addition & 0 deletions hls-test-utils/src/Test/Hls.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ runSessionWithServer' plugins conf sconf caps root s = withLock lock $ keepCurr
, argsDefaultHlsConfig = conf
, argsLogger = argsLogger
, argsIdeOptions = ideOptions
, argsProjectRoot = Just root
}

x <- runSessionWithHandles inW outR sconf' caps root s
Expand Down
2 changes: 1 addition & 1 deletion src/Ide/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ defaultMain recorder args idePlugins = do

BiosMode PrintCradleType -> do
dir <- IO.getCurrentDirectory
hieYaml <- Session.findCradle def dir
hieYaml <- Session.findCradle def (dir </> "a")
cradle <- Session.loadCradle def hieYaml dir
print cradle

Expand Down
Loading