Skip to content

Consolidate emitted IL for-loop tests #17128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 7 commits into from
May 13, 2024
Merged

Consolidate emitted IL for-loop tests #17128

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a98c2a3
Consolidate emitted IL `for`-loop tests
brianrourkeboll May 9, 2024
08a1d4d
Merge branch 'main' of https://github.com/dotnet/fsharp into forloop-…
brianrourkeboll May 9, 2024
03bd399
Update netfx baselines
brianrourkeboll May 9, 2024
509d38f
Fix find/replace bug
brianrourkeboll May 9, 2024
a472566
Unify netstandard assembly version in IL
brianrourkeboll May 9, 2024
fd45ce1
Re-update baselines
brianrourkeboll May 9, 2024
38f772a
Merge branch 'main' into forloop-realsig-consolidate
KevinRansom May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unify netstandard assembly version in IL
  • Loading branch information
@brianrourkeboll
brianrourkeboll committed May 9, 2024
commit a4725660da5555244e4906fb580027c5fa9c6159
11 changes: 7 additions & 4 deletions tests/FSharp.Test.Utilities/ILChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,15 @@ module ILChecker =
|> unifyRuntimeAssemblyName
|> unifyImageBase

// This lets the same test be used when targeting both netfx and netcore.
let unifyNetStandardVersions (text: string) = text.Replace(".ver 2:0:0:0", ".ver 2:1:0:0")

ilCode.Trim()
|> normalizeNewLines
|> stripComments
|> unifyingAssemblyNames
|> unifyMethodLine
|> unifyNetStandardVersions

let private generateIlFile dllFilePath ildasmArgs =
let ilFilePath = Path.ChangeExtension(dllFilePath, ".il")
Expand Down Expand Up @@ -120,9 +124,9 @@ module ILChecker =
match expectedIL with
| [] -> errorMsgOpt <- Some "No Expected IL"
| expectedIL ->
expectedIL
|> List.map (fun (ilCode: string) -> ilCode.Trim())
|> List.iter (fun (ilCode: string) ->
let (|Trimmed|) (ilCode: string) = ilCode.Trim()

for Trimmed ilCode in expectedIL do
let expectedLines = ilCode |> normalizeILText (Some assemblyName) |> prepareLines

if expectedLines.Length = 0 then
Expand Down Expand Up @@ -150,7 +154,6 @@ module ILChecker =
if errors.Count > 0 then
let msg = String.concat "\n" errors + "\n\n\Expected:\n" + ilCode + "\n"
errorMsgOpt <- Some(msg + "\n\n\nActual:\n" + String.Join("\n", actualLines, 0, expectedLines.Length))
)

match errorMsgOpt with
| Some msg ->
Expand Down