Fixed CompilerAssert for non-windows; Updated README

Author: vzarytovskii

tests/FSharp.Test.Utilities/CompilerAssert.fs

@@ -125,7 +125,6 @@ let main argv = 0"""
                 File.WriteAllText(programFsFileName, programFs)
 
                 let pInfo = ProcessStartInfo ()
-
                 pInfo.FileName <- config.DotNetExe
                 pInfo.Arguments <- "build"
                 pInfo.WorkingDirectory <- projectDirectory
@@ -147,7 +146,7 @@ let main argv = 0"""
                 cleanUp <- false
                 printfn "%s" output
                 printfn "%s" errors
-                raise (new Exception (sprintf "An error occured getting netcoreapp references: %A" e))
+                raise (new Exception (sprintf "An error occurred getting netcoreapp references: %A" e))
         finally
             if cleanUp then
                 try Directory.Delete(projectDirectory) with | _ -> ()

tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
     <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
     <OutputType>Library</OutputType>

tests/FSharp.Test.Utilities/TestFramework.fs

@@ -142,41 +142,72 @@ type TestConfig =
       DotNetExe: string
       DefaultPlatform: string}
 
+#if NETCOREAPP
+open System.Runtime.InteropServices
+#endif
 
-module WindowsPlatform = 
-    let Is64BitOperatingSystem envVars =
-        // On Windows PROCESSOR_ARCHITECTURE has the value AMD64 on 64 bit Intel Machines
-        let value =
-            let find s = envVars |> Map.tryFind s
-            [| "PROCESSOR_ARCHITECTURE" |] |> Seq.tryPick (fun s -> find s) |> function None -> "" | Some x -> x
-        value = "AMD64"
+let getOperatingSystem () =
+#if NETCOREAPP
+    let isPlatform p = RuntimeInformation.IsOSPlatform(p)
+    if   isPlatform OSPlatform.Windows then "win"
+    elif isPlatform OSPlatform.Linux   then "linux"
+    elif isPlatform OSPlatform.OSX     then "osx"
+    else                                    "unknown"
+#else
+    "win"
+#endif
 
-type FSLibPaths = 
+module DotnetPlatform =
+    let Is64BitOperatingSystem envVars =
+        match getOperatingSystem () with
+        | "win" ->
+            // On Windows PROCESSOR_ARCHITECTURE has the value AMD64 on 64 bit Intel Machines
+            let value =
+                let find s = envVars |> Map.tryFind s
+                [| "PROCESSOR_ARCHITECTURE" |] |> Seq.tryPick (fun s -> find s) |> function None -> "" | Some x -> x
+            value = "AMD64"
+        | _ -> System.Environment.Is64BitOperatingSystem // As an alternative for netstandard1.4+: System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture
+
+type FSLibPaths =
     { FSCOREDLLPATH : string }
 
-let requireFile nm = 
-    if Commands.fileExists __SOURCE_DIRECTORY__ nm |> Option.isSome then nm else failwith (sprintf "couldn't find %s. Running 'build test' once might solve this issue" nm)
-
-let packagesDir = 
-    match Environment.GetEnvironmentVariable("NUGET_PACKAGES") with
-    | null -> Environment.GetEnvironmentVariable("USERPROFILE") ++ ".nuget" ++ "packages"
-    | path -> path
+let getPackagesDir () =
+    let p = match Environment.GetEnvironmentVariable("NUGET_PACKAGES") with
+            | null ->
+                match  Environment.GetEnvironmentVariable("USERPROFILE") with
+                | null -> Environment.GetEnvironmentVariable("HOME")
+                | p -> p
+            | path -> path
+    p ++ ".nuget" ++ "packages"
+
+let requireFile dir path =
+    // Linux filesystems are (in most cases) case-sensitive.
+    // However when nuget packages are installed to $HOME/.nuget/packages, it seems they are lowercased
+    let fullPath = (dir ++ path)
+    match Commands.fileExists __SOURCE_DIRECTORY__ fullPath with
+    | Some p -> p
+    | None ->
+        let fullPathLower = (dir ++ path.ToLower())
+        match Commands.fileExists __SOURCE_DIRECTORY__ fullPathLower with
+        | Some p -> p
+        | None -> failwith (sprintf "Couldn't find \"%s\" on the following paths: \"%s\", \"%s\". Running 'build test' once might solve this issue" path fullPath fullPathLower)
 
 let config configurationName envVars =
-
     let SCRIPT_ROOT = __SOURCE_DIRECTORY__
 #if NET472
     let fscArchitecture = "net472"
     let fsiArchitecture = "net472"
     let fsharpCoreArchitecture = "net45"
     let fsharpBuildArchitecture = "net472"
     let fsharpCompilerInteractiveSettingsArchitecture = "net472"
+    let peverifyArchitecture = "net472"
 #else
     let fscArchitecture = "netcoreapp3.0"
     let fsiArchitecture = "netcoreapp3.0"
     let fsharpCoreArchitecture = "netstandard2.0"
     let fsharpBuildArchitecture = "netcoreapp3.0"
     let fsharpCompilerInteractiveSettingsArchitecture = "netstandard2.0"
+    let peverifyArchitecture = "netcoreapp3.0"
 #endif
     let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."
     let artifactsPath = repoRoot ++ "artifacts"
@@ -185,31 +216,42 @@ let config configurationName envVars =
     let csc_flags = "/nologo" 
     let fsc_flags = "-r:System.Core.dll --nowarn:20 --define:COMPILED"
     let fsi_flags = "-r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
-    let Is64BitOperatingSystem = WindowsPlatform.Is64BitOperatingSystem envVars
+    let operatingSystem = getOperatingSystem ()
+    let Is64BitOperatingSystem = DotnetPlatform.Is64BitOperatingSystem envVars
     let architectureMoniker = if Is64BitOperatingSystem then "x64" else "x86"
-    let CSC = requireFile (packagesDir ++ "Microsoft.Net.Compilers" ++ "2.7.0" ++ "tools" ++ "csc.exe")
-    let ILDASM = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "ildasm.exe")
-    let ILASM = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "ilasm.exe")
-    let coreclrdll = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.Runtime.CoreCLR") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "coreclr.dll")
-    let PEVERIFY = requireFile (artifactsBinPath ++ "PEVerify" ++ configurationName ++ "net472" ++ "PEVerify.exe")
-    let FSI_FOR_SCRIPTS = artifactsBinPath ++ "fsi" ++ configurationName ++ fsiArchitecture ++ "fsi.exe"
-    let FSharpBuild = requireFile (artifactsBinPath ++ "FSharp.Build" ++ configurationName ++ fsharpBuildArchitecture ++ "FSharp.Build.dll")
-    let FSharpCompilerInteractiveSettings = requireFile (artifactsBinPath ++ "FSharp.Compiler.Interactive.Settings" ++ configurationName ++ fsharpCompilerInteractiveSettingsArchitecture ++ "FSharp.Compiler.Interactive.Settings.dll")
+    let packagesDir = getPackagesDir ()
+    let requirePackage = requireFile packagesDir
+    let requireArtifact = requireFile artifactsBinPath
+    let CSC = requirePackage ("Microsoft.Net.Compilers" ++ "2.7.0" ++ "tools" ++ "csc.exe")
+    let ILDASM_EXE = if operatingSystem = "windows" then "ildasm.exe" else "ildasm"
+    let ILDASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILDASM_EXE)
+    let ILASM_EXE = if operatingSystem = "windows" then "ilasm.exe" else "ilasm"
+    let ILASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILASM_EXE)
+    let CORECLR_DLL = if operatingSystem = "windows" then "coreclr.dll" elif operatingSystem = "osx" then "libcoreclr.dylib" else "libcoreclr.so"
+    let coreclrdll = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.Runtime.CoreCLR") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ CORECLR_DLL)
+    let PEVERIFY_EXE = if operatingSystem = "windows" then "PEVerify.exe" else "PEVerify"
+    let PEVERIFY = requireArtifact ("PEVerify" ++ configurationName ++ peverifyArchitecture ++ PEVERIFY_EXE)
+    let FSharpBuild = requireArtifact ("FSharp.Build" ++ configurationName ++ fsharpBuildArchitecture ++ "FSharp.Build.dll")
+    let FSharpCompilerInteractiveSettings = requireArtifact ("FSharp.Compiler.Interactive.Settings" ++ configurationName ++ fsharpCompilerInteractiveSettingsArchitecture ++ "FSharp.Compiler.Interactive.Settings.dll")
+
     let dotNetExe =
         // first look for {repoRoot}\.dotnet\dotnet.exe, otherwise fallback to %PATH%
-        let repoLocalDotnetPath = repoRoot ++ ".dotnet" ++ "dotnet.exe"
+        let DOTNET_EXE = if operatingSystem = "windows" then "dotnet.exe" else "dotnet"
+        let repoLocalDotnetPath = repoRoot ++ ".dotnet" ++ DOTNET_EXE
         if File.Exists(repoLocalDotnetPath) then repoLocalDotnetPath
-        else "dotnet.exe"
+        else DOTNET_EXE
+
     // ildasm + ilasm requires coreclr.dll to run which has already been restored to the packages directory
-    File.Copy(coreclrdll, Path.GetDirectoryName(ILDASM) ++ "coreclr.dll", overwrite=true)
-    File.Copy(coreclrdll, Path.GetDirectoryName(ILASM) ++ "coreclr.dll", overwrite=true)
+    File.Copy(coreclrdll, Path.GetDirectoryName(ILDASM) ++ CORECLR_DLL, overwrite=true)
+    File.Copy(coreclrdll, Path.GetDirectoryName(ILASM) ++ CORECLR_DLL, overwrite=true)
 
-    let FSI = requireFile (FSI_FOR_SCRIPTS)
+    let FSI_FOR_SCRIPTS = ("fsi" ++ configurationName ++ fsiArchitecture ++ "fsi.exe")
+    let FSI = requireArtifact FSI_FOR_SCRIPTS
 #if !NETCOREAPP
-    let FSIANYCPU = requireFile (artifactsBinPath ++ "fsiAnyCpu" ++ configurationName ++ "net472" ++ "fsiAnyCpu.exe")
+    let FSIANYCPU = requireArtifact ("fsiAnyCpu" ++ configurationName ++ "net472" ++ "fsiAnyCpu.exe")
 #endif
-    let FSC = requireFile (artifactsBinPath ++ "fsc" ++ configurationName ++ fscArchitecture ++ "fsc.exe")
-    let FSCOREDLLPATH = requireFile (artifactsBinPath ++ "FSharp.Core" ++ configurationName ++ fsharpCoreArchitecture ++ "FSharp.Core.dll")
+    let FSC = requireArtifact ("fsc" ++ configurationName ++ fscArchitecture ++ "fsc.exe")
+    let FSCOREDLLPATH = requireArtifact ("FSharp.Core" ++ configurationName ++ fsharpCoreArchitecture ++ "FSharp.Core.dll")
 
     let defaultPlatform = 
         match Is64BitOperatingSystem with 
@@ -279,9 +321,9 @@ let envVars () =
 let initializeSuite () =
 
 #if DEBUG
-    let configurationName = "debug"
+    let configurationName = "Debug"
 #else
-    let configurationName = "release"
+    let configurationName = "Release"
 #endif
     let env = envVars ()
 

tests/README.md

@@ -93,10 +93,9 @@ Existing FSharpQA and Cambridge need to be migrated to corresponding test projec
 
 ## Next steps
 
-* [**In Progress**] Move `FSharp.TestHelpers` to `FSharp.Test.Utilities`.
-* [**In Progress**] Create initial test projects structure for new tests (`FSharp.Compiler.ComponentTests`).
 * [**In Progress**] Migrate existing `NUnit` tests to xUnit.
-* [**In progress**] Change build scripts to run new suites as well as old ones.
+* Clean up CompilerAssert.
+* Make PEVerify tests work in netcore/non-windows environment.
 * Start migration of existing (namely, FSharpQA and Cambridge) suites to xUnit-based projects.
 
 ## Open questions:
@@ -108,5 +107,3 @@ Existing FSharpQA and Cambridge need to be migrated to corresponding test projec
 Related issues: (https://github.com/dotnet/fsharp/issues/7075)
 
 You can find this document under 'tests/README.md'.
-
-**I would like to hear some feedback the community, so we can quickly re-iterate over it (if needed), and start working :)**