Skip to content

Add --testScripting option to eng/build.sh #17327

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 5 commits into from
Jun 28, 2024
Merged

Add --testScripting option to eng/build.sh #17327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dc335c
arm64tests
KevinRansom Jun 24, 2024
a45133d
Merge branch 'main' into addscript
KevinRansom Jun 26, 2024
c4233b6
Merge branch 'main' into addscript
KevinRansom Jun 27, 2024
42bb09b
Merge branch 'main' into addscript
psfinaki Jun 28, 2024
97cc9d3
Update build.sh
psfinaki Jun 28, 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
10 changes: 10 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ usage()
echo " --testcoreclr Run unit tests on .NET Core (short: --test, -t)"
echo " --testCompilerComponentTests Run FSharp.Compiler.ComponentTests on .NET Core"
echo " --testBenchmarks Build and Run Benchmark suite"
echo " --testScripting Run FSharp.Private.ScriptingTests on .NET Core"
echo ""
echo "Advanced settings:"
echo " --ci Building in CI"
Expand Down Expand Up @@ -60,6 +61,7 @@ publish=false
test_core_clr=false
test_compilercomponent_tests=false
test_benchmarks=false
test_scripting=false
configuration="Debug"
verbosity='minimal'
binary_log=false
Expand Down Expand Up @@ -136,6 +138,9 @@ while [[ $# > 0 ]]; do
--testbenchmarks)
test_benchmarks=true
;;
--testscripting)
test_scripting=true
;;
--ci)
ci=true
;;
Expand Down Expand Up @@ -332,4 +337,9 @@ if [[ "$test_benchmarks" == true ]]; then
popd
fi

if [[ "$test_scripting" == true ]]; then
coreclrtestframework=$tfm
Test --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
fi

ExitWithExitCode 0
12 changes: 12 additions & 0 deletions tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ TorchSharp.Tensor.LongTensor.From([| 0L .. 100L |]).Device

[<Fact>]
member _.``Use Dependency Manager to restore packages with native dependencies, build and run script that depends on the results``() =
// Skip test on arm64, because there is not an arm64 netive library
if RuntimeInformation.ProcessArchitecture = Architecture.Arm64 then
()
else
let packagemanagerlines = [|
"r", "Microsoft.ML,version=1.4.0-preview"
"r", "Microsoft.ML.AutoML,version=0.16.0-preview"
Expand Down Expand Up @@ -360,6 +364,10 @@ printfn ""%A"" result

[<Fact>]
member _.``Use NativeResolver to resolve native dlls.``() =
// Skip test on arm64, because there is not an arm64 netive library
if RuntimeInformation.ProcessArchitecture = Architecture.Arm64 then
()
else
let packagemanagerlines = [|
"r", "Microsoft.ML,version=1.4.0-preview"
"r", "Microsoft.ML.AutoML,version=0.16.0-preview"
Expand Down Expand Up @@ -442,6 +450,10 @@ printfn ""%A"" result

[<Fact>]
member _.``Use AssemblyResolver to resolve assemblies``() =
// Skip test on arm64, because there is not an arm64 netive library
if RuntimeInformation.ProcessArchitecture = Architecture.Arm64 then
()
else
let packagemanagerlines = [|
"r", "Microsoft.ML,version=1.4.0-preview"
"r", "Microsoft.ML.AutoML,version=0.16.0-preview"
Expand Down
4 changes: 4 additions & 0 deletions tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@ System.Configuration.ConfigurationManager.AppSettings.Item "Environment" <- "LOC
#if NETSTANDARD
[<Fact>]
member _.``ML - use assembly with native dependencies``() =
// Skip test on arm64, because there is not an arm64 netive library
if RuntimeInformation.ProcessArchitecture = Architecture.Arm64 then
()
else
let code = @"
#r ""nuget:Microsoft.ML,version=1.4.0-preview""
#r ""nuget:Microsoft.ML.AutoML,version=0.16.0-preview""
Expand Down