Skip to content

Added static link tests and extended CompilerAssert #8101

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 5 commits into from
Jan 6, 2020
Merged

Added static link tests and extended CompilerAssert #8101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
421413e
Changed CompilerAssert to static class. Added Compile/Execute methods…
TIHan Jan 6, 2020
b72bcea
Hiding compilation description internals
TIHan Jan 6, 2020
067d555
Added another test to check for sanity
TIHan Jan 6, 2020
6e3fd5f
Making a few optional parameters
TIHan Jan 6, 2020
14cd3af
Hiding internals of CompilationReference
TIHan Jan 6, 2020
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
Hiding internals of CompilationReference
  • Loading branch information
@TIHan
TIHan committed Jan 6, 2020
commit 14cd3af63e089868d581f0b2fa21fb2defcb08a5
10 changes: 5 additions & 5 deletions tests/fsharp/Compiler/CodeGen/EmittedIL/StaticLinkTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type C() = class end
let y = Module1.C()
printfn "%A" y
"""
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference(module1, true)])
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference.CreateFSharp(module1, staticLink=true)])

CompilerAssert.Execute(module2,
beforeExecute=(fun _ deps ->
Expand All @@ -51,7 +51,7 @@ type C() = class end
let y = Module1.C()
printfn "%A" y
"""
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference(module1, false)])
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference.CreateFSharp module1])

Assert.Throws<TargetInvocationException>(fun _ ->
CompilerAssert.Execute(module2,
Expand All @@ -76,7 +76,7 @@ type C() = class end
let y = Module1.C()
printfn "%A" y
"""
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference(module1, false)])
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference.CreateFSharp module1])

CompilerAssert.Execute module2

Expand Down Expand Up @@ -149,7 +149,7 @@ if not test3 then
if test1 && test2 && test3 then ()
else failwith "Test Failed"
"""
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference(module1, true)])
Compilation.Create(source, Fsx, Exe, cmplRefs=[CompilationReference.CreateFSharp(module1, staticLink=true)])

CompilerAssert.Execute(module2, ignoreWarnings=true)

Expand Down Expand Up @@ -222,6 +222,6 @@ if not test3 then
if test1 && test2 && test3 then ()
else failwith "Test Failed"
"""
Compilation.Create(source, Fsx, Exe, [|"--optimize+"|], [CompilationReference(module1, false)])
Compilation.Create(source, Fsx, Exe, [|"--optimize+"|], [CompilationReference.CreateFSharp(module1, staticLink=true)])

CompilerAssert.Execute(module2, ignoreWarnings=true)
7 changes: 5 additions & 2 deletions tests/fsharp/Compiler/CompilerAssert.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ type CompileOutput =
| Library
| Exe

type CompilationReference =
| CompilationReference of Compilation * staticLink: bool
type CompilationReference = private CompilationReference of Compilation * staticLink: bool with

static member CreateFSharp(cmpl: Compilation, ?staticLink) =
let staticLink = defaultArg staticLink false
CompilationReference(cmpl, staticLink)

and Compilation = private Compilation of string * SourceKind * CompileOutput * options: string[] * CompilationReference list with

Expand Down