Skip to content

Commit

Permalink
run-tests: Allow for different expected results on Linux vs macOS.
Browse files Browse the repository at this point in the history
madewokherd committed Nov 21, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 7cc4e12 commit b5982b7
Showing 7 changed files with 28 additions and 16 deletions.
4 changes: 4 additions & 0 deletions tools/run-tests/run-tests.cs
Original file line number Diff line number Diff line change
@@ -683,8 +683,12 @@ int main(string[] arguments)
switch (sysname)
{
case "Linux":
read_stringlist(Path.Combine(BasePath, "wine-linux-passing.txt"), pass_list);
read_stringlist(Path.Combine(BasePath, "wine-linux-failing.txt"), fail_list);
break;
case "Darwin": // macOS
read_stringlist(Path.Combine(BasePath, "wine-macos-passing.txt"), pass_list);
read_stringlist(Path.Combine(BasePath, "wine-macos-failing.txt"), fail_list);
break;
default:
Console.WriteLine($"unknown host OS: {sysname}");
9 changes: 0 additions & 9 deletions tools/run-tests/wine-failing.txt
Original file line number Diff line number Diff line change
@@ -363,7 +363,6 @@ x86.MonoTests.System.Drawing.RegionNonRectTest:Region_Polygon4_IsInfinite
x86.MonoTests.System.Drawing.RegionNonRectTest:Region_Polygon5_IsInfinite
x86.MonoTests.System.Drawing.RegionNonRectTest:Region_Rectangle_IsInfinite
x86.MonoTests.System.Drawing.StringFormatTest:SetMeasurableCharacterRanges_TooBig
x86.MonoTests.System.Drawing.SystemFontsTest:DefaultFont_Names
x86.MonoTests.System.Drawing.TestBitmap:FileDoesNotExists
x86.MonoTests.System.Drawing.TestBitmap:Format16bppArgb1555
x86.MonoTests.System.Drawing.TestBitmap:Format16bppGrayScale
@@ -520,7 +519,6 @@ x86.MonoTests.System.Windows.Forms.ComboBoxTest:DropDownWidth
x86.MonoTests.System.Windows.Forms.ComboBoxTest:ItemHeight
x86.MonoTests.System.Windows.Forms.ComboBoxTest:SelectionWithAdd
x86.MonoTests.System.Windows.Forms.ComboBoxTest:SelectionWithInsert
x86.MonoTests.System.Windows.Forms.ControlTest:FontTest_Names
x86.MonoTests.System.Windows.Forms.CursorTest:CursorPropertyTag
x86.MonoTests.System.Windows.Forms.DataGridTextBoxTest:TestKeyPress_GridButNoColumns
x86.MonoTests.System.Windows.Forms.DataGridViewLinkCellTest:Defaults
@@ -623,7 +621,6 @@ x86.MonoTests.System.Net.HttpResponseStreamTest:CanRead
x86.MonoTests.System.Net.HttpResponseStreamTest:Read_Stream_Closed
x86.MonoTests.System.Net.HttpWebRequestTest:EndGetResponse_AsyncResult_Invalid
x86.MonoTests.System.Net.NetworkInformation.NetworkInterfaceTest:FirstInterfaceSpeed
x86.MonoTests.System.Net.Sockets.SocketTest:SetSocketOption_MulticastInterfaceIndex_Loopback
x86.MonoTests.System.Net.WebSockets.ClientWebSocketTest:ServerHandshakeReturnCrapStatusCodeTest
x86.MonoTests.System.Security.Cryptography.X509Certificates.X509Cert20Test:Export_Pfx
x86.MonoTests.System.Security.Cryptography.X509Certificates.X509Cert20Test:Export_Pkcs12
@@ -1013,7 +1010,6 @@ x86_64.MonoTests.System.Drawing.RegionNonRectTest:Region_Polygon4_IsInfinite
x86_64.MonoTests.System.Drawing.RegionNonRectTest:Region_Polygon5_IsInfinite
x86_64.MonoTests.System.Drawing.RegionNonRectTest:Region_Rectangle_IsInfinite
x86_64.MonoTests.System.Drawing.StringFormatTest:SetMeasurableCharacterRanges_TooBig
x86_64.MonoTests.System.Drawing.SystemFontsTest:DefaultFont_Names
x86_64.MonoTests.System.Drawing.TestBitmap:FileDoesNotExists
x86_64.MonoTests.System.Drawing.TestBitmap:Format16bppArgb1555
x86_64.MonoTests.System.Drawing.TestBitmap:Format16bppGrayScale
@@ -1170,7 +1166,6 @@ x86_64.MonoTests.System.Windows.Forms.ComboBoxTest:DropDownWidth
x86_64.MonoTests.System.Windows.Forms.ComboBoxTest:ItemHeight
x86_64.MonoTests.System.Windows.Forms.ComboBoxTest:SelectionWithAdd
x86_64.MonoTests.System.Windows.Forms.ComboBoxTest:SelectionWithInsert
x86_64.MonoTests.System.Windows.Forms.ControlTest:FontTest_Names
x86_64.MonoTests.System.Windows.Forms.CursorTest:CursorPropertyTag
x86_64.MonoTests.System.Windows.Forms.DataGridTextBoxTest:TestKeyPress_GridButNoColumns
x86_64.MonoTests.System.Windows.Forms.DataGridViewLinkCellTest:Defaults
@@ -1276,7 +1271,6 @@ x86_64.MonoTests.System.Net.HttpResponseStreamTest:CanRead
x86_64.MonoTests.System.Net.HttpResponseStreamTest:Read_Stream_Closed
x86_64.MonoTests.System.Net.HttpWebRequestTest:EndGetResponse_AsyncResult_Invalid
x86_64.MonoTests.System.Net.NetworkInformation.NetworkInterfaceTest:FirstInterfaceSpeed
x86_64.MonoTests.System.Net.Sockets.SocketTest:SetSocketOption_MulticastInterfaceIndex_Loopback
x86_64.MonoTests.System.Net.WebSockets.ClientWebSocketTest:ServerHandshakeReturnCrapStatusCodeTest
x86_64.MonoTests.System.Security.Cryptography.X509Certificates.X509Cert20Test:Export_Pfx
x86_64.MonoTests.System.Security.Cryptography.X509Certificates.X509Cert20Test:Export_Pkcs12
@@ -1289,7 +1283,6 @@ x86_64.MonoTests.System.Windows.Markup.ValueSerializerTest
MonoTests.System.Security.Cryptography.X509Certificates.X509CertificateTest:Certificate7 // Considered a bad test by upstream
MonoTests.System.Windows.Forms.FormTest
MonoTests.System.Windows.Forms.FormTest:MethodScaleControl # Fails in virtual desktop
MonoTests.System.Windows.Forms.FormTest:RestoreBounds # Fails in virtual desktop
MonoTests.System.Xaml.XamlLanguageTest
MonoTests.System.Xaml.XamlMemberTest
MonoTests.System.Xaml.XamlObjectReaderTest
@@ -1404,7 +1397,6 @@ x86.MonoTests.System.Drawing.GraphicsTest:DrawImage_ImageRectangleRectangleGraph
x86.MonoTests.System.Drawing.GraphicsTest:DrawImage_ImageRectangleRectangleGraphicsUnit_World
MonoTests.System.Windows.Forms.ListBoxTest:HeightAndIntegralHeight
MonoTests.System.Reflection.Emit.DynamicMethodTest:InvalidUnicodeName
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTahomaTest
MonoTests.System.Reflection.Emit.DynamicMethodTest
MonoTests.System.TimeZoneInfoTest+PropertiesTests:LocalId # This expects a DllNotFoundException for "libc", but our dllmap changes the exception type, it doesn't test anything on Windows anyway.
x86.MonoTests.Microsoft_VisualBasic.DateAndTimeTests:DateString_1
@@ -1600,7 +1592,6 @@ MonoTests.System.ServiceModel.Discovery.IntegratedDiscoveryTest:UseCase2
MonoTests.System.ServiceModel.Discovery.IntegratedDiscoveryTest:UseCase3
MonoTests.System.ServiceModel.Discovery.IntegratedDiscoveryTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:NewlineCharacterLoggingTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:NewlineCharacterTest
MonoTests.System.Windows.Forms.EventArgsTest:TestToolStripGripRenderEventArgs # ToolStripGrip is larger when themes are enabled
MonoTests.System.Windows.Forms.ToolStripTests:Constructor # ToolStripGrip is larger when themes are enabled
MonoTests.System.Windows.Forms.ToolStripTests:ProtectedProperties # ToolStripGrip is larger when themes are enabled
6 changes: 6 additions & 0 deletions tools/run-tests/wine-linux-failing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:NewlineCharacterTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTahomaTest
MonoTests.System.Drawing.SystemFontsTest:DefaultFont_Names
MonoTests.System.Windows.Forms.ControlTest:FontTest_Names
MonoTests.System.Windows.Forms.FormTest:RestoreBounds # Fails in virtual desktop
MonoTests.System.Net.Sockets.SocketTest:SetSocketOption_MulticastInterfaceIndex_Loopback
5 changes: 5 additions & 0 deletions tools/run-tests/wine-linux-passing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTest
MonoTests.System.Windows.Forms.FormTest:FormStartupPositionChangeTest
MonoTests.System.Windows.Forms.FormTest:FormStartupPositionTest # requires virtual desktop
MonoTests.System.Windows.Forms.FormTest:MaximizedParentedFormTest # requires virtual desktop
MonoTests.System.Net.Sockets.UdpClientTest:Available
6 changes: 6 additions & 0 deletions tools/run-tests/wine-macos-failing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTest
MonoTests.System.Windows.Forms.FormTest:FormStartupPositionChangeTest
MonoTests.System.Windows.Forms.FormTest:FormStartupPositionTest
MonoTests.System.Windows.Forms.FormTest:MaximizedParentedFormTest
MonoTests.System.Net.Sockets.SocketTest
MonoTests.System.Net.Sockets.UdpClientTest:Available
7 changes: 7 additions & 0 deletions tools/run-tests/wine-macos-passing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:NewlineCharacterTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTahomaTest
MonoTests.System.Drawing.SystemFontsTest:DefaultFont_Names
MonoTests.System.Drawing.SystemFontsTest
MonoTests.System.Windows.Forms.ControlTest:FontTest_Names
MonoTests.System.Windows.Forms.FormTest:RestoreBounds
MonoTests.System.Net.Sockets.SocketTest:SetSocketOption_MulticastInterfaceIndex_Loopback
7 changes: 0 additions & 7 deletions tools/run-tests/wine-passing.txt
Original file line number Diff line number Diff line change
@@ -25844,7 +25844,6 @@ x86.MonoTests.System.Windows.Forms.FormTest:FormClosingEvents
x86.MonoTests.System.Windows.Forms.FormTest:FormClosingEventsCancel
x86.MonoTests.System.Windows.Forms.FormTest:FormCreateParamsStyleTest
x86.MonoTests.System.Windows.Forms.FormTest:FormParentedTest
x86.MonoTests.System.Windows.Forms.FormTest:FormStartupPositionChangeTest
x86.MonoTests.System.Windows.Forms.FormTest:GetScaledBoundsTest
x86.MonoTests.System.Windows.Forms.FormTest:GotFocusWithoutCallingOnLoadBase
x86.MonoTests.System.Windows.Forms.FormTest:IsHandleCreated
@@ -33242,7 +33241,6 @@ x86.MonoTests.System.Net.Sockets.TcpListenerTest:PreStartStatus
x86.MonoTests.System.Net.Sockets.TcpListenerTest:StartListenMoreThan5
x86.MonoTests.System.Net.Sockets.TcpListenerTest:TcpListener
x86.MonoTests.System.Net.Sockets.TcpListenerTest
x86.MonoTests.System.Net.Sockets.UdpClientTest:Available
x86.MonoTests.System.Net.Sockets.UdpClientTest:BeginReceive
x86.MonoTests.System.Net.Sockets.UdpClientTest:BeginSend
x86.MonoTests.System.Net.Sockets.UdpClientTest:BeginSendNull
@@ -58655,7 +58653,6 @@ x86_64.MonoTests.System.Windows.Forms.FormTest:FormClosingEvents
x86_64.MonoTests.System.Windows.Forms.FormTest:FormClosingEventsCancel
x86_64.MonoTests.System.Windows.Forms.FormTest:FormCreateParamsStyleTest
x86_64.MonoTests.System.Windows.Forms.FormTest:FormParentedTest
x86_64.MonoTests.System.Windows.Forms.FormTest:FormStartupPositionChangeTest
x86_64.MonoTests.System.Windows.Forms.FormTest:GetScaledBoundsTest
x86_64.MonoTests.System.Windows.Forms.FormTest:GotFocusWithoutCallingOnLoadBase
x86_64.MonoTests.System.Windows.Forms.FormTest:IsHandleCreated
@@ -66082,7 +66079,6 @@ x86_64.MonoTests.System.Net.Sockets.TcpListenerTest:PreStartStatus
x86_64.MonoTests.System.Net.Sockets.TcpListenerTest:StartListenMoreThan5
x86_64.MonoTests.System.Net.Sockets.TcpListenerTest:TcpListener
x86_64.MonoTests.System.Net.Sockets.TcpListenerTest
x86_64.MonoTests.System.Net.Sockets.UdpClientTest:Available
x86_64.MonoTests.System.Net.Sockets.UdpClientTest:BeginReceive
x86_64.MonoTests.System.Net.Sockets.UdpClientTest:BeginSend
x86_64.MonoTests.System.Net.Sockets.UdpClientTest:BeginSendNull
@@ -68966,8 +68962,6 @@ MonoTests.System.Net.WebSockets.ClientWebSocketTest:SendAsyncArgTest_NoArray
MonoTests.System.Windows.Forms.ControlTest:OnPaintDoubleBufferedTest
MonoTests.System.Net.Security.SslStreamTest:AuthenticateClientAndServer_ClientSendsNoData
MonoTests.System.Net.Security.SslStreamTest
MonoTests.System.Windows.Forms.FormTest:FormStartupPositionTest # requires virtual desktop
MonoTests.System.Windows.Forms.FormTest:MaximizedParentedFormTest # requires virtual desktop
MonoTests.System.Xaml.ValueSerializerContextTest:GetService
MonoTests.System.Xaml.ValueSerializerContextTest:NameResolver
MonoTests.System.Xaml.ValueSerializerContextTest
@@ -70260,7 +70254,6 @@ MonoTests.System.Drawing.GraphicsTest:TestReleaseHdc
x86_64.MonoTests.System.Windows.Forms.TimerTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:CreateTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:EmptyLineTest
WineMono.Tests.System.Windows.Media.TextFormatting.TextFormatterTest:SingleWordTest
MonoTests.System.Runtime.CompilerServices.ConditionalWeakTableTest:Add
MonoTests.System.Runtime.CompilerServices.ConditionalWeakTableTest:FinalizableObjectsThatRetainDeadKeys
MonoTests.System.Runtime.CompilerServices.ConditionalWeakTableTest:GetOrCreateValue

0 comments on commit b5982b7

Please sign in to comment.