Migrate Cambridge test suite (tests/fsharp) runner to NUnit #90
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
|
|
||
| module UpdateCmd | ||
|
There was a problem hiding this comment. Please add a comment about what this file is for. There was a problem hiding this comment. it's the 1-1 conversion from There was a problem hiding this comment. I think what I meant was "please take the time to record what this stuff is actually doing" :). I know the original cmd files weren't documented (and of course they should have been) - but now you're going through all this with such a fine toothcomb, it's a great opportunity to add a few basic comments recording what you've learned. |
||
|
|
||
| open System.IO | ||
| open NUnit.Framework | ||
| open Microsoft.Win32 | ||
|
|
||
| open PlatformHelpers | ||
| open FSharpTestSuiteTypes | ||
|
|
||
| type Configuration = | ||
| | DEBUG | ||
| | RELEASE | ||
| override this.ToString() = | ||
|
There was a problem hiding this comment. Why do we need this - is %A printing used on this type? There was a problem hiding this comment. i use that for ConfigurationName argument of msbuild or some bat invocation. |
||
| match this with | ||
| | DEBUG -> "Debug" | ||
| | RELEASE -> "Release" | ||
|
|
||
| type updateCmdArgs = | ||
| { Configuration : Configuration | ||
| Ngen : bool } | ||
|
|
||
| let private regQuery = WindowsPlatform.regQuery | ||
|
|
||
| let private checkResult result = | ||
| match result with | ||
| | CmdResult.ErrorLevel err -> let x = err, (sprintf "ERRORLEVEL %d" err) in Failure (RunError.ProcessExecError x) | ||
| | CmdResult.Success -> Success () | ||
|
|
||
| let updateCmd envVars args = processor { | ||
| // @echo off | ||
| // setlocal | ||
| ignore "useless" | ||
|
|
||
| // if /i "%1" == "debug" goto :ok | ||
| // if /i "%1" == "release" goto :ok | ||
| ignore "already validated input" | ||
|
|
||
| // echo GACs built binaries, adds required strong name verification skipping, and optionally NGens built binaries | ||
| // echo Usage: | ||
| // echo update.cmd debug [-ngen] | ||
| // echo update.cmd release [-ngen] | ||
| // exit /b 1 | ||
| ignore "useless help" | ||
|
|
||
| //:ok | ||
| let env k () = match envVars |> Map.tryFind k with None -> Failure (sprintf "environment variable '%s' not found" k) | Some x -> Success x | ||
| let ``~dp0`` = __SOURCE_DIRECTORY__ | ||
| let exec exe args = | ||
| log "%s %s" exe args | ||
| use toLog = redirectToLog () | ||
| Process.exec { RedirectError = Some toLog.Post; RedirectOutput = Some toLog.Post; RedirectInput = None } ``~dp0`` envVars exe args | ||
|
|
||
| // set BINDIR=%~dp0..\%1\net40\bin | ||
| let! binDir = env "FSCBINPATH" | ||
|
|
||
| // if /i "%PROCESSOR_ARCHITECTURE%"=="x86" set X86_PROGRAMFILES=%ProgramFiles% | ||
| // if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" set X86_PROGRAMFILES=%ProgramFiles(x86)% | ||
| let processorArchitecture = WindowsPlatform.processorArchitecture envVars | ||
| let x86_ProgramFiles = WindowsPlatform.x86ProgramFilesDirectory envVars processorArchitecture | ||
|
|
||
| let! windir = env "windir" | ||
|
|
||
| let REGEXE32BIT path value = | ||
| let hklm32 = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32) | ||
| match hklm32 |> regQuery path value with | ||
| | Some (:? string as d) -> Some d | ||
| | Some _ | None -> None | ||
|
|
||
| let allWINSDKNETFXTOOLS = seq { | ||
| // FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B | ||
| yield REGEXE32BIT @"Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" "InstallationFolder" | ||
| // if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B | ||
| yield REGEXE32BIT @"Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" "InstallationFolder" | ||
| // if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B | ||
| yield REGEXE32BIT @"Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" "InstallationFolder" | ||
| // if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B | ||
| yield REGEXE32BIT @"Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" "InstallationFolder" | ||
| // if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder') DO SET WINSDKNETFXTOOLS=%%B | ||
| yield REGEXE32BIT @"Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" "InstallationFolder" | ||
| } | ||
|
|
||
| let WINSDKNETFXTOOLS = match allWINSDKNETFXTOOLS |> Seq.tryPick id with Some sdk -> sdk | None -> "" | ||
|
|
||
| // set GACUTIL="%WINSDKNETFXTOOLS%gacutil.exe" | ||
| let GACUTIL = WINSDKNETFXTOOLS/"gacutil.exe" | ||
| // set SN32="%WINSDKNETFXTOOLS%sn.exe" | ||
| let SN32 = WINSDKNETFXTOOLS/"sn.exe" | ||
| // set SN64="%WINSDKNETFXTOOLS%x64\sn.exe" | ||
| let SN64 = WINSDKNETFXTOOLS/"x64"/"sn.exe" | ||
| // set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe | ||
| let NGEN32 = windir/"Microsoft.NET"/"Framework"/"v4.0.30319"/"ngen.exe" | ||
| // set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe | ||
| let NGEN64 = windir/"Microsoft.NET"/"Framework64"/"v4.0.30319"/"ngen.exe" | ||
|
|
||
| let checkResult = function CmdResult.ErrorLevel err -> Failure (sprintf "ERRORLEVEL %d" err) | CmdResult.Success -> Success () | ||
|
|
||
| let gacutil flags = Commands.gacutil exec GACUTIL flags >> checkResult | ||
| let ngen32 = Commands.ngen exec NGEN32 >> checkResult | ||
| let ngen64 = Commands.ngen exec NGEN64 >> checkResult | ||
| let sn32 = exec SN32 >> checkResult | ||
| let sn64 = exec SN32 >> checkResult | ||
|
|
||
| // rem Disable strong-name validation for F# binaries built from open source that are signed with the microsoft key | ||
| // %SN32% -Vr FSharp.Core,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Build,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Compiler,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.Editor,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.LanguageService,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.LanguageService.Compiler,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a | ||
| // %SN32% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a | ||
| // %SN32% -Vr Unittests,b03f5f7f11d50a3a | ||
| // %SN32% -Vr Salsa,b03f5f7f11d50a3a | ||
|
|
||
| let strongName (snExe: string -> Result<_,_>) = processor { | ||
| let all = | ||
| [ "FSharp.Core"; | ||
| "FSharp.Build"; | ||
| "FSharp.Compiler.Interactive.Settings";"FSharp.Compiler.Hosted"; | ||
| "FSharp.Compiler";"FSharp.Compiler.Server.Shared"; | ||
| "FSharp.Editor"; | ||
| "FSharp.LanguageService";"FSharp.LanguageService.Base";"FSharp.LanguageService.Compiler"; | ||
| "FSharp.ProjectSystem.Base";"FSharp.ProjectSystem.FSharp";"FSharp.ProjectSystem.PropertyPages"; | ||
| "FSharp.VS.FSI"; | ||
| "Unittests"; | ||
| "Salsa" ] | ||
| for a in all do | ||
| do! snExe (sprintf " -Vr %s,b03f5f7f11d50a3a" a) | ||
| } | ||
|
|
||
| do! strongName sn32 | ||
|
|
||
| //if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( | ||
| do! if processorArchitecture = AMD64 then | ||
| // %SN64% -Vr FSharp.Core,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Build,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Compiler.Hosted,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Compiler,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.Editor,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.LanguageService,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.LanguageService.Compiler,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a | ||
| // %SN64% -Vr FSharp.VS.FSI,b03f5f7f11d50a3a | ||
| // %SN64% -Vr Unittests,b03f5f7f11d50a3a | ||
| // %SN64% -Vr Salsa,b03f5f7f11d50a3a | ||
| strongName sn64 | ||
| else | ||
| (fun () -> Success ()) | ||
| //) | ||
|
|
||
| // rem Only GACing FSharp.Core for now | ||
| // %GACUTIL% /if %BINDIR%\FSharp.Core.dll | ||
| do! gacutil "/if" (binDir/"FSharp.Core.dll") | ||
|
|
||
| // rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll | ||
| // if /i not "%2"=="-ngen" goto :donengen | ||
|
|
||
| if args.Ngen then | ||
| // "%NGEN32%" install "%BINDIR%\fsc.exe" /queue:1 | ||
| // "%NGEN32%" install "%BINDIR%\fsi.exe" /queue:1 | ||
| // "%NGEN32%" install "%BINDIR%\FSharp.Build.dll" /queue:1 | ||
| // "%NGEN32%" executeQueuedItems 1 | ||
| do! ngen32 [binDir/"fsc.exe"; binDir/"fsi.exe"; binDir/"FSharp.Build.dll"] | ||
|
|
||
| // if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( | ||
| if processorArchitecture = AMD64 then | ||
| // "%NGEN64%" install "%BINDIR%\fsiAnyCpu.exe" /queue:1 | ||
| // "%NGEN64%" install "%BINDIR%\FSharp.Build.dll" /queue:1 | ||
| // "%NGEN64%" executeQueuedItems 1 | ||
| do! ngen64 [binDir/"fsiAnyCpu.exe"; binDir/"FSharp.Build.dll"] | ||
| // ) | ||
| //:donengen | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we really want two different versions of NUnit? How about removing the old one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the old nunit is used in unit tests projects.
These proj are going to be converted to xunit instead of upgrade to nunit 3 in coreclr branch ( see #699 ) temporary or not.
Now nunit 3 final is release, so maybe is easier to upgrade the suite to nunit 3 final in all projects (usefull for coreclr too), but that's another pr