Merge pull request #3528 from BrzVlad/fix-sgen-check-before-collections

[mono.git] / mcs / class / corlib / Test / System.Resources / ResourceReaderTest.cs

diff --git a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
index c37ffea83ee0ef8863964386de58a77365e9bb50..55f00dd8bede15797ed25b02495180e54f79ccfb 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
+++ b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
@@ -28,15 +28,9 @@ namespace MonoTests.System.Resources
                [TestFixtureSetUp]
                public void FixtureSetUp ()
                {
-                       char ds = Path.DirectorySeparatorChar;
-                       if (ds == '/') {
-                               string base_path = Path.Combine (Directory.GetCurrentDirectory (), Path.Combine ("Test", "resources"));
-                               m_ResourceFile = Path.Combine (base_path, "MyResources.resources");
-                               m_BadResourceFile = Path.Combine (base_path, "Empty.resources");
-                       } else {
-                               m_ResourceFile = Path.Combine ("Test", Path.Combine ("resources", "MyResources.resources"));
-                               m_BadResourceFile = "resources" + ds + "Empty.resources";
-                       }
+                       string base_path = Path.Combine (Directory.GetCurrentDirectory (), Path.Combine ("Test", "resources"));
+                       m_ResourceFile = Path.Combine (base_path, "MyResources.resources");
+                       m_BadResourceFile = Path.Combine (base_path, "Empty.resources");
                }
 
                [SetUp]
@@ -90,6 +84,7 @@ namespace MonoTests.System.Resources
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                [ExpectedException (typeof (BadImageFormatException))]
                public void ConstructorString_Bad ()
                {