Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs

@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
+
 using System.Data;
 using System.Data.OleDb;
 
@@ -193,3 +195,5 @@ namespace MonoTests.System.Data.OleDb
 		}
 	}
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs

@@ -26,6 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
 using System;
 using System.Data;
 using System.Data.OleDb;
@@ -229,3 +230,5 @@ namespace MonoTests.System.Data.OleDb
 		}
 	}
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs

@@ -26,9 +26,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
+
 using System;
 using System.Data;
+#if !NO_ODBC
 using System.Data.Odbc;
+#endif
 using System.Data.OleDb;
 
 using NUnit.Framework;
@@ -450,3 +454,5 @@ namespace MonoTests.System.Data.OleDb
 		}
 	}
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs

@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
+
 using System.Data.OleDb;
 using NUnit.Framework;
 
@@ -49,3 +51,5 @@ namespace MonoTests.System.Data.OleDb
                 }
         }
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs

@@ -27,6 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
 using NUnit.Framework;
 using System;
 using System.Data;
@@ -56,3 +57,5 @@ namespace MonoTests.System.Data.OleDb {
 		}
 	}
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs

@@ -27,6 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
 using NUnit.Framework;
 using System;
 using System.Data;
@@ -196,3 +197,5 @@ namespace MonoTests.System.Data.OleDb {
 		}
 	}
 }
+
+#endif

mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs

@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_OLEDB
+
 using NUnit.Framework;
 using System;
 using System.Data;
@@ -129,3 +131,5 @@ namespace MonoTests.System.Data.OleDb {
 		}
 	}
 }
+
+#endif