Skip to content

Even more compileroptions #14253

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
merged 6 commits into from
Nov 9, 2022
Merged

Even more compileroptions #14253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd79ce3
checked
KevinRansom Nov 8, 2022
02a4f8d
net7.0
KevinRansom Nov 8, 2022
49e06ff
tweak
KevinRansom Nov 9, 2022
4181189
cliversion
KevinRansom Nov 9, 2022
f48b1e5
Merge branch 'main' into evenmorecompileroptions
KevinRansom Nov 9, 2022
816a507
foo
KevinRansom Nov 9, 2022
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
0 ...tions/fsc/checked/UncheckedDefaultOf01.fs → ...tions/fsc/checked/UncheckedDefaultOf01.fs
View file
Open in desktop
File renamed without changes.
171 changes: 171 additions & 0 deletions tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace FSharp.Compiler.ComponentTests.CompilerOptions

open FSharp.Test
open FSharp.Test.Compiler
open Xunit

module Checked =

// SOURCE=unchecked01.fs # fsc-default
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-unchecked - unchecked01.fs`` compilation =
compilation
|> asFs
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked" # fsc-checked
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-unchecked - unchecked01.fs --checked`` compilation =
compilation
|> asFs
|> withOptions["--checked"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked+" # fsc-checked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-unchecked - unchecked01.fs --checked+`` compilation =
compilation
|> asFs
|> withOptions["--checked+"]
|> compile
|> shouldSucceed

// SOURCE=unchecked01.fs SCFLAGS="--checked-" # fsc-checked-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-unchecked - unchecked01.fs --checked-`` compilation =
compilation
|> asFs
|> withOptions["--checked-"]
|> compile
|> shouldSucceed

// SOURCE=unchecked01.fs SCFLAGS="--checked-" # fsc-checked-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsi-unchecked - unchecked01.fs --checked-`` compilation =
compilation
|> asFsx
|> withOptions["--checked-"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsi-checked - checked01.fs --checked`` compilation =
compilation
|> asFsx
|> withOptions["--checked"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked+" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsi-checked - checked01.fs --checked+`` compilation =
compilation
|> asFsx
|> withOptions["--checked+"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked-" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsi-checked - checked01.fs --checked-`` compilation =
compilation
|> asFsx
|> withOptions["--checked-"]
|> compile
|> shouldSucceed


//# Last one wins

// SOURCE=checked01.fs SCFLAGS="--checked --checked+" # fsc-checkedchecked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsc-checked - checked01.fs --checked --checked+`` compilation =
compilation
|> asFs
|> withOptions["--checked"; "--checked+"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked- --checked+" # fsc-checked-checked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsc-checked - checked01.fs --checked- --checked+`` compilation =
compilation
|> asFs
|> withOptions["--checked-"; "--checked+"]
|> compile
|> shouldSucceed

// SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-" # fsc-checked+checked-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-checked - unchecked01.fs --checked+ --checked-`` compilation =
compilation
|> asFs
|> withOptions["--checked+"; "--checked-"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked --checked+" # fsc-checkedchecked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsi-checked - checked01.fs --checked --checked+`` compilation =
compilation
|> asFsx
|> withOptions["--checked"; "--checked+"]
|> compile
|> shouldSucceed

// SOURCE=checked01.fs SCFLAGS="--checked- --checked+" # fsc-checked-checked+
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
let ``fsi-checked - checked01.fs --checked- --checked+`` compilation =
compilation
|> asFsx
|> withOptions["--checked-"; "--checked+"]
|> compile
|> shouldSucceed

// SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-" # fsc-checked+checked-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsi-checked - unchecked01.fs --checked+ --checked-`` compilation =
compilation
|> asFsx
|> withOptions["--checked+"; "--checked-"]
|> compile
|> shouldSucceed

//# Unrecognized argument
// SOURCE=unrecogarg.fs SCFLAGS="--Checked" # fsc--Checked
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
let ``fsc-checked - unchecked01.fs Checked`` compilation =
compilation
|> asFs
|> withOptions["--Checked"]
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--Checked'")
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
let ``fsc-checked - unchecked01.fs --checked-star`` compilation =
compilation
|> asFs
|> withOptions["--checked*"]
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--checked*'")
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UncheckedDefaultOf01.fs"|])>]
let ``fsc-checked - UncheckedDefaultOf01`` compilation =
compilation
|> asFs
|> asExe
|> compile
|> shouldSucceed
0 .../CompilerOptions/fsc/checked/checked01.fs → .../CompilerOptions/fsc/checked/checked01.fs
View file
Open in desktop
File renamed without changes.
0 ...ompilerOptions/fsc/checked/unchecked01.fs → ...ompilerOptions/fsc/checked/unchecked01.fs
View file
Open in desktop
File renamed without changes.
0 ...CompilerOptions/fsc/checked/unrecogarg.fs → ...CompilerOptions/fsc/checked/unrecogarg.fs
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/cliversion.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace FSharp.Compiler.ComponentTests.CompilerOptions

open Xunit
open FSharp.Test
open FSharp.Test.Compiler

module cliversion =

//# SOURCE=E_fsc_cliversion.fs SCFLAGS="--cliversion:2.0" # fsc --cliversion:2.0
[<Fact>]
let ``fsc --cliversion:2.0``() =
FSharp """
"""
|> asExe
|> withOptions ["--cliversion:2.0"]
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'")
]

//# SOURCE=E_fsi_cliversion.fs SCFLAGS="--cliversion:2.0" FSIMODE=EXEC COMPILE_ONLY=1 # fsi --cliversion:2.0
[<Fact>]
let ``fsi --cliversion:2.0``() =
FSharp """
"""
|> asFsx
|> withOptions ["--cliversion:2.0"]
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'")
]

2 changes: 2 additions & 0 deletions tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
<Compile Include="Scripting\Interactive.fs" />
<Compile Include="TypeChecks\CheckDeclarationsTests.fs" />
<Compile Include="TypeChecks\ParallelCheckingWithSignatureFilesTests.fs" />
<Compile Include="CompilerOptions\fsc\checked\checked.fs" />
<Compile Include="CompilerOptions\fsc\cliversion.fs" />
<Compile Include="CompilerOptions\fsc\langversion.fs" />
<Compile Include="CompilerOptions\fsc\noframework\noframework.fs" />
<Compile Include="CompilerOptions\fsc\platform\platform.fs" />
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Test.Utilities/CompilerAssert.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ module rec CompilerAssertHelpers =
"tfm": "net7.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "6.0"
"version": "7.0"
}
}
}"""
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />

</Project>
6 changes: 2 additions & 4 deletions tests/FSharp.Test.Utilities/Utilities.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ module Utilities =
<TargetFramework>$TARGETFRAMEWORK</TargetFramework>
<UseFSharpPreview>true</UseFSharpPreview>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DotnetFscCompilerPath>$DOTNETFSCCOMPILERPATH</DotnetFscCompilerPath>
</PropertyGroup>

<ItemGroup><Compile Include="Program.fs" /></ItemGroup>
Expand Down Expand Up @@ -171,7 +170,6 @@ let main argv = 0"""
let pathToTemp = Path.Combine(pathToArtifacts, "Temp")
let projectDirectory = Path.Combine(pathToTemp,Guid.NewGuid().ToString() + ".tmp")
let pathToFSharpCore = typeof<RequireQualifiedAccessAttribute>.Assembly.Location
let dotNetFscCompilerPath = config.DOTNETFSCCOMPILERPATH
try
try
Directory.CreateDirectory(projectDirectory) |> ignore
Expand All @@ -181,9 +179,9 @@ let main argv = 0"""
let directoryBuildTargetsFileName = Path.Combine(projectDirectory, "Directory.Build.targets")
let frameworkReferencesFileName = Path.Combine(projectDirectory, "FrameworkReferences.txt")
#if NETCOREAPP
File.WriteAllText(projectFileName, projectFile.Replace("$TARGETFRAMEWORK", "net7.0").Replace("$FSHARPCORELOCATION", pathToFSharpCore).Replace("$DOTNETFSCCOMPILERPATH", dotNetFscCompilerPath))
File.WriteAllText(projectFileName, projectFile.Replace("$TARGETFRAMEWORK", "net7.0").Replace("$FSHARPCORELOCATION", pathToFSharpCore))
#else
File.WriteAllText(projectFileName, projectFile.Replace("$TARGETFRAMEWORK", "net472").Replace("$FSHARPCORELOCATION", pathToFSharpCore).Replace("$DOTNETFSCCOMPILERPATH", dotNetFscCompilerPath))
File.WriteAllText(projectFileName, projectFile.Replace("$TARGETFRAMEWORK", "net472").Replace("$FSHARPCORELOCATION", pathToFSharpCore))
#endif
File.WriteAllText(programFsFileName, programFs)
File.WriteAllText(directoryBuildPropsFileName, directoryBuildProps)
Expand Down
29 changes: 0 additions & 29 deletions tests/fsharpqa/Source/CompilerOptions/fsc/checked/env.lst
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/fsharpqa/Source/CompilerOptions/fsc/cliversion/E_fsc_cliversion.fs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/fsharpqa/Source/CompilerOptions/fsc/cliversion/E_fsi_cliversion.fs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions tests/fsharpqa/Source/CompilerOptions/fsc/cliversion/env.lst
View file
Open in desktop

This file was deleted.