Surface area tests: improve updating FCS baselines

.gitignore

@@ -74,6 +74,7 @@ launchSettings.json
 *.jrs
 *.chk
 *.bak
+*.out
 *.vserr
 *.err
 *.orig

tests/FSharp.Compiler.Service.Tests/SurfaceArea.fs

@@ -19,19 +19,14 @@ type SurfaceAreaTest() =
 
     [<Fact>]
     member _.VerifySurfaceAreaFSharpCompilerService() =
+        // System.Environment.SetEnvironmentVariable("TEST_UPDATE_BSL", "1")
 
         let platform = "netstandard20"
 
-        let flavor =
-#if DEBUG
-            "debug"
-#else
-            "release"
-#endif
         let assembly =
             let path = Path.Combine(Path.GetDirectoryName(typeof<int list>.Assembly.Location), "FSharp.Compiler.Service.dll")
             Assembly.LoadFrom path
 
-        let baseline = Path.Combine(__SOURCE_DIRECTORY__, $"FSharp.Compiler.Service.SurfaceArea.{platform}.{flavor}.bsl")
-        let outFileName = $"FSharp.Compiler.Service.SurfaceArea.{platform}.{flavor}.out"
+        let baseline = Path.Combine(__SOURCE_DIRECTORY__, $"FSharp.Compiler.Service.SurfaceArea.{platform}.bsl")
+        let outFileName = Path.Combine(__SOURCE_DIRECTORY__, $"FSharp.Compiler.Service.SurfaceArea.{platform}.out")
         FSharp.Test.SurfaceArea.verify assembly baseline outFileName

tests/FSharp.Core.UnitTests/SurfaceArea.fs

@@ -3,7 +3,6 @@
 namespace FSharp.Core.UnitTests.Portable.SurfaceArea
 
 open Xunit
-open System
 open System.IO
 open FSharp.Test
 
@@ -39,5 +38,5 @@ type SurfaceAreaTest() =
 #endif
         let assembly = typeof<int list>.Assembly
         let baseline = Path.Combine(__SOURCE_DIRECTORY__, $"FSharp.Core.SurfaceArea.{platform}.{flavor}.bsl")
-        let outFileName = $"FSharp.Core.SurfaceArea.{platform}.{flavor}.out"
-        FSharp.Test.SurfaceArea.verify assembly baseline outFileName
+        let outFileName = Path.Combine(Path.GetDirectoryName(assembly.Location), $"FSharp.Core.SurfaceArea.{platform}.{flavor}.out")
+        SurfaceArea.verify assembly baseline outFileName

tests/FSharp.Test.Utilities/SurfaceArea.fs

@@ -44,8 +44,7 @@ module FSharp.Test.SurfaceArea
     let private appendNewLine str = str + System.Environment.NewLine
 
     // verify public surface area matches expected, handles baseline update when TEST_UPDATE_BSL is set
-    let verify assembly baselinePath outFileName : unit =
-
+    let verify assembly baselinePath outFilePath : unit =
         let expected =
             File.ReadAllLines(baselinePath)
             |> String.concat System.Environment.NewLine
@@ -62,24 +61,23 @@ module FSharp.Test.SurfaceArea
 
         let expected = normalize expected
 
-        let logFile =
-            Path.Combine(Path.GetDirectoryName(assembly.Location), outFileName)
-
-        File.WriteAllText(logFile, actual)
-
         match Assert.shouldBeSameMultilineStringSets expected actual with
-        | None -> ()
+        | None ->
+            File.Delete(outFilePath)
+
         | Some diff ->
-            // Update baselines here
             match Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") with
-            | null -> ()
-            | _ -> File.Copy(logFile, baselinePath, true)
-                
-            let msg = $"""Assembly: %A{asm}
+            | null ->
+                File.WriteAllText(outFilePath, actual)
+
+                let msg = $"""Assembly: %A{asm}
 
-              Expected and actual surface area don't match. To see the delta, run:
-                  windiff {baselinePath} {logFile}
+                  Expected and actual surface area don't match. To see the delta, run:
+                      windiff {baselinePath} {outFilePath}
 
-              {diff}"""
+                  {diff}"""
 
-            failwith msg
+                failwith msg
+            | _ ->
+                File.Delete(outFilePath)
+                File.WriteAllText(baselinePath, actual)