Skip to content

Merge master to release/dev16.7 #9587

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
cartermp merged 1 commit into from
Jun 29, 2020
Merged

Merge master to release/dev16.7 #9587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Re enable tests for operators: OperatorsModule1.fs and OperatorsModul… 
…e2.fs (#9516)

* Re-enabling tests from OperatorsModule1/2.fs (compile errors)

* Fix compile errors in OperatorsModule1/2.fs, fix tests. Note tanh test comment.

* Fix `tanh` test, ensure stable result on x86 vs x64 runtimes

* Stop using exception AssertionException, so that test window shows useful info

* Whitespace cleanup and redundant code removal

* Cleanup spelling etc

* Re-enabling int, int16, int32, int64, nativeint, incr, nullArg etc tests

* Special-case floating-point assertion messages for higher precision output

* Fix/update/add tests (some still failing)

* Separate Checked tests, add & fix others, differentiate framework/bitness for some tests

* Add branch for .NET Native (ignore cos test)

* Resorting to comparing floats with a delta using Assert.AreNearEqual

* Add some more tests
  • Loading branch information
@abelbraaksma
abelbraaksma authored Jun 28, 2020
commit 97778cbfcf738d4a077588b63c438a2c8b2b25fe
19 changes: 12 additions & 7 deletions tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
<ItemGroup>
<Compile Include="NUnitFrameworkShims.fs" />
<Compile Include="LibraryTestFx.fs" />
<Compile Include="FSharp.Core\PrimTypes.fs" />
<Compile Include="FSharp.Core\ComparersRegression.fs" />
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
<Compile Include="FSharp.Core\RecordTypes.fs" />
<Compile Include="FSharp.Core\OperatorsModule1.fs" />
<Compile Include="FSharp.Core\OperatorsModule2.fs" />
<Compile Include="FSharp.Core\OperatorsModuleChecked.fs" />

<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
Expand All @@ -59,10 +66,6 @@
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqMultipleIteration.fs" />
<Compile Include="FSharp.Core\PrimTypes.fs" />
<Compile Include="FSharp.Core\ComparersRegression.fs" />
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
<Compile Include="FSharp.Core\RecordTypes.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversionsGenerated.fs" />
Expand All @@ -87,9 +90,7 @@
<Compile Include="SurfaceArea.net40.fs" Condition="$(TargetFramework.StartsWith('net4'))" />
</ItemGroup>

<ItemGroup>
<Content Include="**/*" Exclude="**/*.bak;Directory.Build.Props;Directory.Build.targets;FSharp.Core.UnitTests.fsproj" CopyToOutputDirectory="never" />
</ItemGroup>
<ItemGroup />

<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' == 'true'">
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
Expand All @@ -106,4 +107,8 @@
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<Content Remove="FSharp.Core\OperatorsModule2.fs" />
</ItemGroup>

</Project>
Loading