Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Hamons <chris.hamons@xamarin.com>2017-01-11 01:59:08 +0300
committerGitHub <noreply@github.com>2017-01-11 01:59:08 +0300
commitbb0564ff3c09a56155d94ae13498500efc6fb74b (patch)
tree88738cedf3398de5f1bb314d9ff254c258ffe161 /mcs/class/System.Data
parent6c97220ddcb7e8a06892c747984685bf30d0b9a7 (diff)
Mono BCL test fixes so XM can run them (#4210)
Diffstat (limited to 'mcs/class/System.Data')
-rw-r--r--mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs2
-rw-r--r--mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs4
-rw-r--r--mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs2
-rw-r--r--mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs2
4 files changed, 5 insertions, 5 deletions
diff --git a/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
index 9722b5be1b7..5edab9cf29d 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if !MOBILE
+#if !MOBILE && !MONOMAC
using System;
using System.Configuration;
diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
index a8974949973..3cd936090fb 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
@@ -32,7 +32,7 @@ using System.Data.Common;
using System.Data.SqlClient;
/*--For Bug 853 Test Begin--*/
-#if !MOBILE
+#if !MOBILE && !MONOMAC
using Mono.Data.Sqlite;
#endif
/*--For Bug 853 Test End--*/
@@ -189,7 +189,7 @@ namespace MonoTests.System.Data.Common
Assert.IsNotNull (ex.Message, "#4");
}
}
-#if !MOBILE
+#if !MOBILE && !MONOMAC
[Test]
[Category ("NotWorking")] // Requires newer sqlite than is on wrench
public void XimarinBugzillaBug853Test()
diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
index fe239ea4fb9..7fd810a697a 100644
--- a/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if !MOBILE
+#if !MOBILE && !MONOMAC
using System.IO;
using System.Xml;
diff --git a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
index 2e2890b4ec5..8b35f50b83a 100644
--- a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
@@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if !MOBILE
+#if !MOBILE && !MONOMAC
using System;
using System.CodeDom;