Fix tests, make them more generic

Author: safesparrow

tests/ParallelTypeCheckingTests/ComponentTests_args.txt

@@ -29,4 +29,12 @@ let _parse (argv: string[]): Args =
 
 [<EntryPoint>]
 let main _argv =
+    let workDir, path = CompilationFromArgsTests.codebases[0]
+    let stuff =
+        {
+            Path = path
+            WorkingDir = Some workDir
+            Mode = Method.ParallelFs
+        }
+    CompilationFromArgsTests.TestCompilerFromArgs stuff
     0

tests/ParallelTypeCheckingTests/Program.fs

@@ -7,12 +7,14 @@ open FSharp.Compiler.Service.Tests
 open NUnit.Framework
 open Utils
 
+let codebases =
+    [
+        @"$CODE_ROOT$\tests\FSharp.Compiler.ComponentTests", @"$CODE_ROOT$\tests\ParallelTypeCheckingTests\ComponentTests_args.txt"
+        @"$CODE_ROOT$\src\compiler", @"$CODE_ROOT$\tests\ParallelTypeCheckingTests\Tests\FCSArgs.txt"
+    ]
+
 let configs =
-    let codebases =
-        [
-            @"C:\projekty\fsharp\heuristic\tests\FSharp.Compiler.ComponentTests", @"C:\projekty\fsharp\heuristic\tests\ParallelTypeCheckingTests\ComponentTests_args.txt"
-            @"C:\projekty\fsharp\fsharp_main\src\compiler", @"C:\projekty\fsharp\heuristic\tests\ParallelTypeCheckingTests\Tests\FCSArgs.txt"
-        ]
+    
 
     methods
     |> List.allPairs codebases
@@ -43,17 +45,21 @@ let setupArgsMethod (method: Method) (args: string[]): string[] =
 
 let setupParsed config =
     let {Path = path; Mode = mode; WorkingDir = workingDir} = config
-    let args = System.IO.File.ReadAllLines(path)
+    let args =
+        System.IO.File.ReadAllLines(path |> replacePaths)
+        |> Array.map replacePaths
+        
     printfn $"WorkingDir = {workingDir}"
+    printfn $"%+A{args}"
     let args = setupArgsMethod mode args
-    workingDir |> Option.iter (fun dir -> Environment.CurrentDirectory <- dir)
+    workingDir |> Option.iter (fun dir -> Environment.CurrentDirectory <- replaceCodeRoot dir)
     args
 
 [<TestCaseSource(nameof(configs))>]
 let TestCompilerFromArgs (config : Args) : unit =
     let oldWorkDir = Environment.CurrentDirectory
     try
-        let args = setupParsed config
+        let args = setupParsed config        
         let exit = CommandLineMain.main args
         Assert.That(exit, Is.Zero)
     finally