From 7ee032202d1c1c82d84473fec6eb1d82a0889a85 Mon Sep 17 00:00:00 2001 From: Esme Povirk Date: Fri, 2 Aug 2024 19:14:21 +0000 Subject: [PATCH] mono: Update from main branch. --- mono | 2 +- tools/run-tests/windows-failing.txt | 64 ----------------------------- tools/run-tests/windows-passing.txt | 56 +++++++++++++++++++++++++ tools/run-tests/wine-failing.txt | 1 + tools/run-tests/wine-passing.txt | 7 ++++ 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/mono b/mono index 2c871c6f..983328b0 160000 --- a/mono +++ b/mono @@ -1 +1 @@ -Subproject commit 2c871c6f93e11393d639d50d3d8cade6c1f70ac0 +Subproject commit 983328b0220b1c8f8f29cee2b306723389751ffb diff --git a/tools/run-tests/windows-failing.txt b/tools/run-tests/windows-failing.txt index 2251d38c..2ffc0603 100644 --- a/tools/run-tests/windows-failing.txt +++ b/tools/run-tests/windows-failing.txt @@ -1282,14 +1282,8 @@ x86.MonoTests.System.Drawing.ColorConverterTest:ConvertFromInvariantString_Inval x86.MonoTests.System.Drawing.ColorConverterTest:ConvertFromString_FromHtml_PoundTooLarge x86.MonoTests.System.Drawing.ColorConverterTest:ConvertFromString_InvalidNumber x86.MonoTests.System.Drawing.ColorConverterTest:ConvertFrom_x4 -x86.MonoTests.System.Drawing.ColorTest:Deserialize -x86.MonoTests.System.Drawing.ColorTest:Deserialize2 -x86.MonoTests.System.Drawing.ColorTest:Deserialize3 -x86.MonoTests.System.Drawing.ColorTest:Deserialize4 x86.MonoTests.System.Drawing.ColorTest:Equality -x86.MonoTests.System.Drawing.ColorTest:SerializationRoundtrip x86.MonoTests.System.Drawing.ColorTest:TestEquals -x86.MonoTests.System.Drawing.ColorTest:WindowsSystemColors x86.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundInt x86.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundNegative x86.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundTooLarge @@ -1367,8 +1361,6 @@ x86.MonoTests.System.Drawing.SizeFConverterTest:TestCreateInstance_Int x86.MonoTests.System.Drawing.SizeFTest:TestEquals x86.MonoTests.System.Drawing.SizeTest:TestEquals x86.MonoTests.System.Drawing.SolidBrushTest:Clone -x86.MonoTests.System.Drawing.SystemIconsTest:Dispose_Indirect -x86.MonoTests.System.Drawing.SystemIconsTest:Dispose_SystemIcons x86.MonoTests.System.Drawing.TestBitmap:Format32bppRgb x86.MonoTests.System.Drawing.TestBitmap:LockBitmap_Format32bppArgb_Format32bppRgb_ReadWrite_Partial x86.MonoTests.System.Drawing.TestBitmap:LockBitmap_Format32bppArgb_Format32bppRgb_ReadWrite_Whole @@ -3733,14 +3725,8 @@ x86_64.MonoTests.System.Drawing.ColorConverterTest:ConvertFromInvariantString_In x86_64.MonoTests.System.Drawing.ColorConverterTest:ConvertFromString_FromHtml_PoundTooLarge x86_64.MonoTests.System.Drawing.ColorConverterTest:ConvertFromString_InvalidNumber x86_64.MonoTests.System.Drawing.ColorConverterTest:ConvertFrom_x4 -x86_64.MonoTests.System.Drawing.ColorTest:Deserialize -x86_64.MonoTests.System.Drawing.ColorTest:Deserialize2 -x86_64.MonoTests.System.Drawing.ColorTest:Deserialize3 -x86_64.MonoTests.System.Drawing.ColorTest:Deserialize4 x86_64.MonoTests.System.Drawing.ColorTest:Equality -x86_64.MonoTests.System.Drawing.ColorTest:SerializationRoundtrip x86_64.MonoTests.System.Drawing.ColorTest:TestEquals -x86_64.MonoTests.System.Drawing.ColorTest:WindowsSystemColors x86_64.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundInt x86_64.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundNegative x86_64.MonoTests.System.Drawing.ColorTranslatorTest:FromHtml_PoundTooLarge @@ -3817,8 +3803,6 @@ x86_64.MonoTests.System.Drawing.SizeFConverterTest:TestCreateInstance_Int x86_64.MonoTests.System.Drawing.SizeFTest:TestEquals x86_64.MonoTests.System.Drawing.SizeTest:TestEquals x86_64.MonoTests.System.Drawing.SolidBrushTest:Clone -x86_64.MonoTests.System.Drawing.SystemIconsTest:Dispose_Indirect -x86_64.MonoTests.System.Drawing.SystemIconsTest:Dispose_SystemIcons x86_64.MonoTests.System.Drawing.TestBitmap:Format32bppRgb x86_64.MonoTests.System.Drawing.TestBitmap:LockBitmap_Format32bppArgb_Format32bppRgb_ReadWrite_Partial x86_64.MonoTests.System.Drawing.TestBitmap:LockBitmap_Format32bppArgb_Format32bppRgb_ReadWrite_Whole @@ -5233,52 +5217,6 @@ MonoTests.System.Drawing.FontTest:Font_String_Float_FontStyle_GraphicsUnit_Byte_ MonoTests.System.Drawing.FontTest:GetHashCode_NameDiffers_HashesNotEqual MonoTests.System.Drawing.FontTest:ToLogFont_DenyUnmanagedCode MonoTests.System.Drawing.FontTest:UnavailableStyleException -MonoTests.System.Drawing.GDIPlusTest:CloneFontFamily -MonoTests.System.Drawing.GDIPlusTest:CreateBitmapFromScan0 -MonoTests.System.Drawing.GDIPlusTest:CreateCustomLineCap -MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient -MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient_FromPath_Line -MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient_FromPath_Lines -MonoTests.System.Drawing.GDIPlusTest:CreatePen -MonoTests.System.Drawing.GDIPlusTest:CreateRegionRgnData -MonoTests.System.Drawing.GDIPlusTest:DeleteBrush -MonoTests.System.Drawing.GDIPlusTest:DeleteFontFamily -MonoTests.System.Drawing.GDIPlusTest:DeleteFontFamily_DoubleDispose -MonoTests.System.Drawing.GDIPlusTest:DisposeImage -MonoTests.System.Drawing.GDIPlusTest:DrawRectangles -MonoTests.System.Drawing.GDIPlusTest:DrawingOperations -MonoTests.System.Drawing.GDIPlusTest:Encoder -MonoTests.System.Drawing.GDIPlusTest:Format16bppGrayScale_GetSetPixel -MonoTests.System.Drawing.GDIPlusTest:GdipCreateBitmapFromFile_FileNotFound -MonoTests.System.Drawing.GDIPlusTest:GdipCreateFromHDC_Null -MonoTests.System.Drawing.GDIPlusTest:GdipGetImageGraphicsContext_Null -MonoTests.System.Drawing.GDIPlusTest:GdipLoadImageFromFile_FileNotFound -MonoTests.System.Drawing.GDIPlusTest:GetImageThumbnail -MonoTests.System.Drawing.GDIPlusTest:GetPointCount_Zero -MonoTests.System.Drawing.GDIPlusTest:GraphicsPathIterator -MonoTests.System.Drawing.GDIPlusTest:GraphicsPathIterator_WithoutPath -MonoTests.System.Drawing.GDIPlusTest:ImageAttribute -MonoTests.System.Drawing.GDIPlusTest:Matrix -MonoTests.System.Drawing.GDIPlusTest:Matrix2 -MonoTests.System.Drawing.GDIPlusTest:Matrix3 -MonoTests.System.Drawing.GDIPlusTest:MeasureCharacterRanges -MonoTests.System.Drawing.GDIPlusTest:Metafile -MonoTests.System.Drawing.GDIPlusTest:Metafile_GetMetafileHeaderFromFile -MonoTests.System.Drawing.GDIPlusTest:Metafile_Hemf -MonoTests.System.Drawing.GDIPlusTest:PenColor_81266 -MonoTests.System.Drawing.GDIPlusTest:RecordMetafileFileName -MonoTests.System.Drawing.GDIPlusTest:StringFormat -MonoTests.System.Drawing.GDIPlusTest:StringFormat_Clone -MonoTests.System.Drawing.GDIPlusTest:StringFormat_GenericDefault -MonoTests.System.Drawing.GDIPlusTest:StringFormat_GenericTypographic -MonoTests.System.Drawing.GDIPlusTest:Texture -MonoTests.System.Drawing.GDIPlusTest:Texture2 -MonoTests.System.Drawing.GDIPlusTest:TextureIA -MonoTests.System.Drawing.GDIPlusTest:Unlock -MonoTests.System.Drawing.GDIPlusTest:Widen -MonoTests.System.Drawing.IconTest:CreateFromCursor -MonoTests.System.Drawing.ImageTest:XmlSerialization -MonoTests.System.Drawing.ImageTest:XmlSerialize MonoTests.System.Windows.Forms.DataGridViewTest:ColumnHeadersDefaultCellStyle MonoTests.System.Windows.Forms.DataGridViewTest:DefaultCellStyle MonoTests.System.Windows.Forms.DataGridViewTest:GetClipboardContents @@ -5292,8 +5230,6 @@ MonoTests.System.Windows.Forms.FormTest:VisibleOnLoad MonoTests.System.Windows.Forms.TimerTest:RunningThread MonoTests.System.Windows.Forms.TimerTest:StartTest MonoTests.System.Drawing.Printing.PrintingServicesUnixTest:BuiltInPrinting -MonoTests.System.Drawing.TestBitmap:XmlSerialization -MonoTests.System.Drawing.TestBitmap:XmlSerialize MonoTests.System.Net.ServicePointTest:All MonoTests.System.Net.ServicePointTest:DnsRefreshTimeout MonoTests.System.Net.ServicePointTest:EndPointBind diff --git a/tools/run-tests/windows-passing.txt b/tools/run-tests/windows-passing.txt index d303011f..9e4c3118 100644 --- a/tools/run-tests/windows-passing.txt +++ b/tools/run-tests/windows-passing.txt @@ -76539,6 +76539,62 @@ MonoTests.System.Net.Mail.SmtpClientTest:Send_SpecifiedPickupDirectory_PickupDir MonoTests.System.Net.Mail.SmtpClientTest:Timeout MonoTests.System.Net.Mail.SmtpClientTest:Timeout_Value_Negative MonoTests.System.Net.Mail.SmtpClientTest:UseDefaultCredentials_Default +MonoTests.System.Drawing.ColorTest:Deserialize +MonoTests.System.Drawing.ColorTest:Deserialize2 +MonoTests.System.Drawing.ColorTest:Deserialize3 +MonoTests.System.Drawing.ColorTest:Deserialize4 +MonoTests.System.Drawing.ColorTest:SerializationRoundtrip +MonoTests.System.Drawing.ColorTest:WindowsSystemColors +MonoTests.System.Drawing.GDIPlusTest:CloneFontFamily +MonoTests.System.Drawing.GDIPlusTest:CreateBitmapFromScan0 +MonoTests.System.Drawing.GDIPlusTest:CreateCustomLineCap +MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient +MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient_FromPath_Line +MonoTests.System.Drawing.GDIPlusTest:CreatePathGradient_FromPath_Lines +MonoTests.System.Drawing.GDIPlusTest:CreatePen +MonoTests.System.Drawing.GDIPlusTest:CreateRegionRgnData +MonoTests.System.Drawing.GDIPlusTest:DeleteBrush +MonoTests.System.Drawing.GDIPlusTest:DeleteFontFamily +MonoTests.System.Drawing.GDIPlusTest:DeleteFontFamily_DoubleDispose +MonoTests.System.Drawing.GDIPlusTest:DisposeImage +MonoTests.System.Drawing.GDIPlusTest:DrawRectangles +MonoTests.System.Drawing.GDIPlusTest:DrawingOperations +MonoTests.System.Drawing.GDIPlusTest:Encoder +MonoTests.System.Drawing.GDIPlusTest:Format16bppGrayScale_GetSetPixel +MonoTests.System.Drawing.GDIPlusTest:GdipCreateBitmapFromFile_FileNotFound +MonoTests.System.Drawing.GDIPlusTest:GdipCreateFromHDC_Null +MonoTests.System.Drawing.GDIPlusTest:GdipGetImageGraphicsContext_Null +MonoTests.System.Drawing.GDIPlusTest:GdipLoadImageFromFile_FileNotFound +MonoTests.System.Drawing.GDIPlusTest:GetImageThumbnail +MonoTests.System.Drawing.GDIPlusTest:GetPointCount_Zero +MonoTests.System.Drawing.GDIPlusTest:GraphicsPathIterator +MonoTests.System.Drawing.GDIPlusTest:GraphicsPathIterator_WithoutPath +MonoTests.System.Drawing.GDIPlusTest:ImageAttribute +MonoTests.System.Drawing.GDIPlusTest:Matrix +MonoTests.System.Drawing.GDIPlusTest:Matrix2 +MonoTests.System.Drawing.GDIPlusTest:Matrix3 +MonoTests.System.Drawing.GDIPlusTest:MeasureCharacterRanges +MonoTests.System.Drawing.GDIPlusTest:Metafile +MonoTests.System.Drawing.GDIPlusTest:Metafile_GetMetafileHeaderFromFile +MonoTests.System.Drawing.GDIPlusTest:Metafile_Hemf +MonoTests.System.Drawing.GDIPlusTest:PenColor_81266 +MonoTests.System.Drawing.GDIPlusTest:RecordMetafileFileName +MonoTests.System.Drawing.GDIPlusTest:StringFormat +MonoTests.System.Drawing.GDIPlusTest:StringFormat_Clone +MonoTests.System.Drawing.GDIPlusTest:StringFormat_GenericDefault +MonoTests.System.Drawing.GDIPlusTest:StringFormat_GenericTypographic +MonoTests.System.Drawing.GDIPlusTest:Texture +MonoTests.System.Drawing.GDIPlusTest:Texture2 +MonoTests.System.Drawing.GDIPlusTest:TextureIA +MonoTests.System.Drawing.GDIPlusTest:Unlock +MonoTests.System.Drawing.GDIPlusTest:Widen +MonoTests.System.Drawing.IconTest:CreateFromCursor +MonoTests.System.Drawing.ImageTest:XmlSerialization +MonoTests.System.Drawing.ImageTest:XmlSerialize +MonoTests.System.Drawing.SystemIconsTest:Dispose_Indirect +MonoTests.System.Drawing.SystemIconsTest:Dispose_SystemIcons +MonoTests.System.Drawing.TestBitmap:XmlSerialization +MonoTests.System.Drawing.TestBitmap:XmlSerialize # unreliable: x86.thread-exit MonoTests.System.Threading.Tasks.TaskTests:DoubleWaitTest diff --git a/tools/run-tests/wine-failing.txt b/tools/run-tests/wine-failing.txt index 7a538b10..44b2a381 100644 --- a/tools/run-tests/wine-failing.txt +++ b/tools/run-tests/wine-failing.txt @@ -1445,6 +1445,7 @@ MonoTests.System.Windows.Forms.DataGridViewTest:RowHeadersWidth MonoTests.System.Windows.Forms.ListViewTest:ListViewPropertyTest MonoTests.System.Net.Mail.SmtpClientTest:Credentials_Default MonoTests.System.Net.Mail.SmtpClientTest:Host_Default +MonoTests.System.Drawing.ColorTest:WindowsSystemColors # definitely unreliable: delegate2 MonoTests.System.Threading.ThreadLocalTests:DisposeOnThreadExit diff --git a/tools/run-tests/wine-passing.txt b/tools/run-tests/wine-passing.txt index b8834bf8..995967af 100644 --- a/tools/run-tests/wine-passing.txt +++ b/tools/run-tests/wine-passing.txt @@ -74374,6 +74374,13 @@ MonoTests.System.Net.Mail.SmtpClientTest:Send_SpecifiedPickupDirectory_PickupDir MonoTests.System.Net.Mail.SmtpClientTest:Timeout MonoTests.System.Net.Mail.SmtpClientTest:Timeout_Value_Negative MonoTests.System.Net.Mail.SmtpClientTest:UseDefaultCredentials_Default +MonoTests.System.Drawing.ColorTest:Deserialize +MonoTests.System.Drawing.ColorTest:Deserialize2 +MonoTests.System.Drawing.ColorTest:Deserialize3 +MonoTests.System.Drawing.ColorTest:Deserialize4 +MonoTests.System.Drawing.ColorTest:SerializationRoundtrip +MonoTests.System.Drawing.SystemIconsTest:Dispose_Indirect +MonoTests.System.Drawing.SystemIconsTest:Dispose_SystemIcons # definitely unreliable: delegate2 MonoTests.System.Threading.ThreadLocalTests:DisposeOnThreadExit