[runtime] Skip not supported tests with mkbundle

diff --git a/mcs/build/tests.make b/mcs/build/tests.make
index b9f869e651d99e4a6de6baa049e7462eadc33549..a30a9e97f794c4f729d45d026dc51ee224a5e5be 100644 (file)
--- a/mcs/build/tests.make
+++ b/mcs/build/tests.make
@@ -169,9 +169,10 @@ $(MKBUNDLE_TEST_BIN): $(TEST_ASSEMBLIES) $(TEST_HARNESS) $(MKBUNDLE_EXE)
 endif # PLATFORM_AOT_SUFFIX
 
 ifneq ($(wildcard $(MKBUNDLE_TEST_BIN)),)
-TEST_HARNESS_EXEC = $(MKBUNDLE_TEST_BIN)
+TEST_HARNESS_EXEC=$(MKBUNDLE_TEST_BIN)
+TEST_HARNESS_EXCLUDES:=$(TEST_HARNESS_EXCLUDES),StaticLinkedAotNotWorking
 else 
-TEST_HARNESS_EXEC = $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS) 
+TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS) 
 endif
 
 ## FIXME: i18n problem in the 'sed' command below

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
index f637e8cc326abd7c019506a39af0ed43e59ad850..6926379c96a82185fc75974e15b93607425e4093 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
@@ -97,6 +97,7 @@ namespace MonoTests.System.Xml
                }\r
 \r
                [Test]\r
+               [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe\r
                public void TestAsync ()\r
                {\r
                        var loc = Assembly.GetExecutingAssembly ().Location;\r

diff --git a/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs b/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs
index 1aa78a9d99368a75faa4bee76c1c0eecb03e35f8..3681b5cc25c1af680e836b7236a9939754e78871 100644 (file)
--- a/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs
+++ b/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs
@@ -46,6 +46,7 @@ namespace MonoTests.System.IO.Compression
 
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Constructor_Null ()
                {
                        DeflateStream ds = new DeflateStream (null, CompressionMode.Compress);
@@ -53,12 +54,14 @@ namespace MonoTests.System.IO.Compression
 
                [Test]
                [ExpectedException (typeof (ArgumentException))]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Constructor_InvalidCompressionMode ()
                {
                        DeflateStream ds = new DeflateStream (new MemoryStream (), (CompressionMode)Int32.MinValue);
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckCompressDecompress ()
                {
                        byte [] data = new byte[100000];
@@ -81,6 +84,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckDecompress ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -92,6 +96,7 @@ namespace MonoTests.System.IO.Compression
 
                // https://bugzilla.xamarin.com/show_bug.cgi?id=22346
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckEmptyRead ()
                {
                        byte [] dummy = new byte[1];
@@ -102,6 +107,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentNullException))]
                public void CheckNullRead ()
                {
@@ -111,6 +117,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (InvalidOperationException))]
                public void CheckCompressingRead ()
                {
@@ -121,6 +128,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentException))]
                public void CheckRangeRead ()
                {
@@ -132,6 +140,7 @@ namespace MonoTests.System.IO.Compression
 
 #if !MOBILE
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [Category("NotWorking")]
                [ExpectedException (typeof (InvalidDataException))]
                public void CheckInvalidDataRead ()
@@ -145,6 +154,7 @@ namespace MonoTests.System.IO.Compression
 #endif
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ObjectDisposedException))]
                public void CheckClosedRead ()
                {
@@ -156,6 +166,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ObjectDisposedException))]
                public void CheckClosedFlush ()
                {
@@ -166,6 +177,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSeek ()
                {
@@ -175,6 +187,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSetLength ()
                {
@@ -184,6 +197,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanSeekProp ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -204,6 +218,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanReadProp ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -224,6 +239,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanWriteProp ()
                {
                        MemoryStream backing = new MemoryStream ();
@@ -244,6 +260,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSetLengthProp ()
                {
@@ -253,6 +270,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckGetLengthProp ()
                {
@@ -262,6 +280,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckGetPositionProp ()
                {
@@ -271,6 +290,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void DisposeTest ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -284,6 +304,7 @@ namespace MonoTests.System.IO.Compression
 
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void JunkAtTheEnd ()
                {
                        // Write a deflated stream, then some additional data...
@@ -330,6 +351,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Bug19313 ()
                {
                        byte [] buffer  = new byte [512];
@@ -344,6 +366,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckNet45Overloads () // Xambug #21982
                {
                        MemoryStream dataStream = GenerateStreamFromString("Hello");
@@ -362,6 +385,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentException))]
                public void CheckBufferOverrun ()
                {
@@ -374,6 +398,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Bug28777_EmptyFlush ()
                {
                        MemoryStream backing = new MemoryStream ();
@@ -384,6 +409,7 @@ namespace MonoTests.System.IO.Compression
                }
                
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Bug28777_DoubleFlush ()
                {
                        byte[] buffer = new byte [4096];
@@ -397,6 +423,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Bug34916_Inflate ()
                {
                        var base64String = @"H4sIAAAAAAAAA6yVu27bQBBF/4VtZGHeD3ZJmhTp5C5IIUiEIcCWDEUugiD/nmEQwYRNURFAsuFwd2exZ++d+farud89davT+um5aRsC1DuEO+R7lJayRV9m5gegFqBZNB83m5fjevOzadGWUPHjaXd62XYVEy3Z04wiMTKIX0dfV0G/6FO3Pu72D/+iL916W9GbOV/X58SaS6zEKKyoGUA1eNg/nLfF2jUEBBNMtT4Wzeq567Z9HkZkE1Osf93msN/+WO32m+7zsavsh30/BUU8fy+uUCC+QIHpPQW1RAXkEGWUmSnUy2iUYSMYOGpARYViiIHcqY5kExS8rg2vY8gLGEjeYsClBVE4ORQHz3kxsEF4iS01xzBIZkgYQcYQQ7C54LQaIrxWn5+4ioT1BiRQN8Fh6MrOPjOS9Eh3M8YRJJQMZioJkUODFA8RNJ9AYuYBNyGJW5D0oi3/EpZ3dWYk5X5PN81RJGJgDATMQ5X02nFS1imVlMGvu0XwBg5/K1hY1U8tecxcNDy1/FAnG+OAQSi9PliHRaNUiuoxQYFB6T8oyAUKEu9LJ6oipbr1spyZArhWX6qbi7EOUrs7SCAoDNVgzKagMlUz+q6DQ4N8/yM=";
@@ -415,6 +442,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void Bug44994_Inflate()
                {
                        var base64String = @"7cWxCQAgDACwpeBjgqsgXiHU0fd9QzBLErX1EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADepcxcuU/atm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm37zy8=";
@@ -434,6 +462,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [Category ("MobileNotWorking")]
                public void Bug44994_InflateByteByByte()
                {

diff --git a/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs b/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs
index 47a740ca14ace19a3450a045a7720c6cabe83cf7..243c30ebe1057c261b47e9284b3df981e95feb18 100644 (file)
--- a/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs
+++ b/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs
@@ -44,6 +44,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentNullException))]
                public void Constructor_Null ()
                {
@@ -51,6 +52,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentException))]
                public void Constructor_InvalidCompressionMode ()
                {
@@ -58,6 +60,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckCompressDecompress ()
                {
                        byte [] data = new byte[100000];
@@ -80,6 +83,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckDecompress ()
                {
                        byte [] data = {0x1f, 0x8b, 0x08, 0x08, 0x70, 0xbb, 0x5d, 0x41, 0x00, 0x03, 0x74, 0x65, 0x73, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0xe7, 0x02, 0x00, 0x16, 0x35, 0x96, 0x31, 0x06, 0x00, 0x00, 0x00 };
@@ -91,6 +95,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentNullException))]
                public void CheckNullRead ()
                {
@@ -101,6 +106,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (InvalidOperationException))]
                public void CheckCompressingRead ()
                {
@@ -111,6 +117,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ArgumentException))]
                public void CheckRangeRead ()
                {
@@ -123,6 +130,7 @@ namespace MonoTests.System.IO.Compression
 
 #if !MOBILE
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [Category("NotWorking")]
                public void CheckInvalidDataRead ()
                {
@@ -139,6 +147,7 @@ namespace MonoTests.System.IO.Compression
 #endif
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckClosedRead ()
                {
                        byte [] dummy = new byte[20];
@@ -153,6 +162,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (ObjectDisposedException))]
                public void CheckClosedFlush ()
                {
@@ -163,6 +173,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSeek ()
                {
@@ -172,6 +183,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSetLength ()
                {
@@ -181,6 +193,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanSeekProp ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -201,6 +214,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanReadProp ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -221,6 +235,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckGetCanWriteProp ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -241,6 +256,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckSetLengthProp ()
                {
@@ -250,6 +266,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckGetLengthProp ()
                {
@@ -259,6 +276,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                [ExpectedException (typeof (NotSupportedException))]
                public void CheckGetPositionProp ()
                {
@@ -268,6 +286,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void DisposeTest ()
                {
                        MemoryStream backing = new MemoryStream (compressed_data);
@@ -277,6 +296,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void DisposeOrderTest ()
                {
                        var fs = new MemoryStream();
@@ -304,6 +324,7 @@ namespace MonoTests.System.IO.Compression
                }
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
                public void CheckNet45Overloads () // Xambug #21982
                {
                        MemoryStream dataStream = GenerateStreamFromString("Hello");

diff --git a/mcs/class/System/Test/System.Net/HttpWebResponseTest.cs b/mcs/class/System/Test/System.Net/HttpWebResponseTest.cs
index ffa7f6359e5cd5ec17d70cc0701ff96b41e6d76f..b35c8e7a5959fb8f8f2898165665c45a91e70a37 100644 (file)
--- a/mcs/class/System/Test/System.Net/HttpWebResponseTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpWebResponseTest.cs
@@ -1220,6 +1220,7 @@ namespace MonoTests.System.Net
 
 
                [Test]
+               [Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 #if FEATURE_NO_BSD_SOCKETS
                [ExpectedException (typeof (PlatformNotSupportedException))]
 #endif

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
index ceac114da7162b26a38bebe2d929b454118bee24..12f7602d6b0863c6fc752bae2cc7dc1fafe8cfef 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
@@ -1111,6 +1111,7 @@ public class AssemblyNameTest {
 
        [Test]
        [Category ("AndroidNotWorking")] // Accessing assemblies by asm.Location is not supported
+       [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
        public void GetAssemblyName_CodeBase ()
        {
                Assembly execAssembly = Assembly.GetExecutingAssembly ();

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index b3a9ba8012726d237f2048468e8fee5e77fee8a7..d8bbbeb169c09ad09f4ef3272961113f79f53f62 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -322,6 +322,7 @@ namespace MonoTests.System.Reflection
 
                [Test]
                [Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
+               [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
                public void GetFiles_False ()
                {
                        Assembly corlib = typeof (int).Assembly;
@@ -335,6 +336,7 @@ namespace MonoTests.System.Reflection
 
                [Test]
                [Category ("AndroidNotWorking")] // Assemblies in Xamarin.Android cannot be accessed as FileStream
+               [Category ("StaticLinkedAotNotWorking")] // Can't find .dll files when bundled in .exe
                public void GetFiles_True ()
                {
                        Assembly corlib = typeof (int).Assembly;