Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
safesparrow committed Nov 9, 2022
1 parent d6690eb commit e4643f2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<Content Include="Tests\FCS.args.txt" />
<Content Include="Tests\FCS.prepare.ps1" />
<Content Include="Tests\ComponentTests.args.txt" />
<Content Include="Tests\.gitignore" />
<Compile Include="Program.fs" />
<Content Include="Docs.md" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let internal setupParsed config =
setupCompilationMethod method

printfn $"WorkingDir = {workingDir}"
workingDir |> Option.iter (fun dir -> Environment.CurrentDirectory <- replaceCodeRoot dir)
workingDir |> Option.iter (fun dir -> Environment.CurrentDirectory <- dir)
args

let internal TestCompilerFromArgs (config : Args) : unit =
Expand Down
4 changes: 0 additions & 4 deletions tests/ParallelTypeCheckingTests/Tests/Utils.fs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ open OpenTelemetry
open OpenTelemetry.Resources
open OpenTelemetry.Trace

let CodeRoot =
@$"{__SOURCE_DIRECTORY__}\.checkouts\fcs"
let replaceCodeRoot (s : string) = s.Replace("$CODE_ROOT$", CodeRoot)
let packages =
// Here we assume that the NuGet packages are located in a certain user folder,
// and that the projects being compiled use that global package cache
Expand All @@ -22,7 +19,6 @@ let packages =
Environment.ExpandEnvironmentVariables(pathWithEnv);
let replacePaths (s : string) =
s
|> replaceCodeRoot
|> fun s -> s.Replace("$PACKAGES$", packages)

[<Struct>]
Expand Down

0 comments on commit e4643f2

Please sign in to comment.