Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit d35e804

Browse files
dotnet-botabelbraaksma
authored andcommitted
Re enable tests for operators: OperatorsModule1.fs and OperatorsModule2.fs (dotnet#9516) (dotnet#9587)
* 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 Co-authored-by: Abel Braaksma <abel.online@xs4all.nl>
1 parent e540404 commit d35e804

File tree

6 files changed

+1197
-897
lines changed

6 files changed

+1197
-897
lines changed

tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@
4040
<ItemGroup>
4141
<Compile Include="NUnitFrameworkShims.fs" />
4242
<Compile Include="LibraryTestFx.fs" />
43+
<Compile Include="FSharp.Core\PrimTypes.fs" />
44+
<Compile Include="FSharp.Core\ComparersRegression.fs" />
45+
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
46+
<Compile Include="FSharp.Core\RecordTypes.fs" />
47+
<Compile Include="FSharp.Core\OperatorsModule1.fs" />
48+
<Compile Include="FSharp.Core\OperatorsModule2.fs" />
49+
<Compile Include="FSharp.Core\OperatorsModuleChecked.fs" />
4350

4451
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" />
4552
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
@@ -66,10 +73,6 @@
6673
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" />
6774
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
6875
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqMultipleIteration.fs" />
69-
<Compile Include="FSharp.Core\PrimTypes.fs" />
70-
<Compile Include="FSharp.Core\ComparersRegression.fs" />
71-
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
72-
<Compile Include="FSharp.Core\RecordTypes.fs" />
7376
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
7477
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />
7578
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversionsGenerated.fs" />
@@ -94,9 +97,7 @@
9497
<Compile Include="SurfaceArea.net40.fs" Condition="$(TargetFramework.StartsWith('net4'))" />
9598
</ItemGroup>
9699

97-
<ItemGroup>
98-
<Content Include="**/*" Exclude="**/*.bak;Directory.Build.Props;Directory.Build.targets;FSharp.Core.UnitTests.fsproj" CopyToOutputDirectory="never" />
99-
</ItemGroup>
100+
<ItemGroup />
100101

101102
<ItemGroup Condition="'$(BUILD_IN_FSHARP_REPOSITORY)' == 'true'">
102103
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
@@ -113,4 +114,8 @@
113114
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
114115
</ItemGroup>
115116

117+
<ItemGroup>
118+
<Content Remove="FSharp.Core\OperatorsModule2.fs" />
119+
</ItemGroup>
120+
116121
</Project>

0 commit comments

Comments
 (0)