Skip to content

Commit b60e903

Browse files
Re enable tests for operators: OperatorsModule1.fs and OperatorsModule2.fs (#9516) (#9588)
* 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 83789f4 commit b60e903

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
@@ -33,6 +33,13 @@
3333
<ItemGroup>
3434
<Compile Include="NUnitFrameworkShims.fs" />
3535
<Compile Include="LibraryTestFx.fs" />
36+
<Compile Include="FSharp.Core\PrimTypes.fs" />
37+
<Compile Include="FSharp.Core\ComparersRegression.fs" />
38+
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
39+
<Compile Include="FSharp.Core\RecordTypes.fs" />
40+
<Compile Include="FSharp.Core\OperatorsModule1.fs" />
41+
<Compile Include="FSharp.Core\OperatorsModule2.fs" />
42+
<Compile Include="FSharp.Core\OperatorsModuleChecked.fs" />
3643

3744
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\Utils.fs" />
3845
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\ArrayModule.fs" />
@@ -59,10 +66,6 @@
5966
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\CollectionModulesConsistency.fs" />
6067
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\StringModule.fs" />
6168
<Compile Include="FSharp.Core\Microsoft.FSharp.Collections\SeqMultipleIteration.fs" />
62-
<Compile Include="FSharp.Core\PrimTypes.fs" />
63-
<Compile Include="FSharp.Core\ComparersRegression.fs" />
64-
<Compile Include="FSharp.Core\DiscrimantedUnionType.fs" />
65-
<Compile Include="FSharp.Core\RecordTypes.fs" />
6669
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\BigIntType.fs" />
6770
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversions.fs" />
6871
<Compile Include="FSharp.Core\Microsoft.FSharp.Core\IntConversionsGenerated.fs" />
@@ -88,9 +91,7 @@
8891
<Compile Include="SurfaceArea.net40.fs" Condition="$(TargetFramework.StartsWith('net4'))" />
8992
</ItemGroup>
9093

91-
<ItemGroup>
92-
<Content Include="**/*" Exclude="**/*.bak;Directory.Build.Props;Directory.Build.targets;FSharp.Core.UnitTests.fsproj" CopyToOutputDirectory="never" />
93-
</ItemGroup>
94+
<ItemGroup />
9495

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

111+
<ItemGroup>
112+
<Content Remove="FSharp.Core\OperatorsModule2.fs" />
113+
</ItemGroup>
114+
110115
</Project>

0 commit comments

Comments
 (0)