Skip to content

Improve directory attribute refactor - Break up PR #18161 - Part 2 #18196

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
psfinaki merged 2 commits into from
Jan 8, 2025
Merged

Improve directory attribute refactor - Break up PR #18161 - Part 2 #18196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32b9db1
More tests - directory attribute improvements
KevinRansom Jan 7, 2025
400a8fa
methordresolution
KevinRansom Jan 7, 2025
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
119 changes: 68 additions & 51 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
Expand Up @@ -9,71 +9,79 @@ open Xunit
module Checked =

// SOURCE=unchecked01.fs # fsc-default
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
let ``fsc-unchecked - unchecked01_fs`` compilation =
compilation
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsc-unchecked - unchecked01_fs`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsc-unchecked - unchecked01_fs --checked`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsc-unchecked - unchecked01_fs --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsc-unchecked - unchecked01_fs --checked-`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsi-unchecked - unchecked01_fs --checked-`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsi-checked - checked01_fs --checked`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsi-checked - checked01_fs --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsi-checked - checked01_fs --checked-`` compilation =
compilation
|> getCompilation
|> asFsx
|> withOptions["--checked-"]
|> compile
Expand All @@ -83,64 +91,71 @@ module Checked =
//# 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsc-checked - checked01_fs --checked --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsc-checked - checked01_fs --checked- --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsc-checked - unchecked01_fs --checked+ --checked-`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsi-checked - checked01_fs --checked --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("checked01.fs")>]
let ``fsi-checked - checked01_fs --checked- --checked+`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unchecked01.fs")>]
let ``fsi-checked - unchecked01_fs --checked+ --checked-`` compilation =
compilation
|> getCompilation
|> 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
[<Theory; FileInlineData("unrecogarg.fs")>]
let ``fsc-checked - unchecked01_fs Checked`` compilation =
compilation
|> getCompilation
|> asFs
|> withOptions["--Checked"]
|> compile
Expand All @@ -150,9 +165,10 @@ module Checked =
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
let ``fsc-checked - unchecked01_fs --checked-star`` compilation =
compilation
[<Theory; FileInlineData("unrecogarg.fs")>]
let ``fsc-checked - unchecked01_fs --checked-star`` compilation =
compilation
|> getCompilation
|> asFs
|> withOptions["--checked*"]
|> compile
Expand All @@ -162,9 +178,10 @@ module Checked =
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UncheckedDefaultOf01.fs"|])>]
let ``fsc-checked - UncheckedDefaultOf01`` compilation =
compilation
[<Theory; FileInlineData( "UncheckedDefaultOf01.fs")>]
let ``fsc-checked - UncheckedDefaultOf01`` compilation =
compilation
|> getCompilation
|> asFs
|> asExe
|> compile
Expand Down
Loading
Loading