From: Marek Safar <marek.safar@gmail.com>
Date: Thu, 23 Mar 2017 09:14:56 +0000 (+0100)
Subject: [System.Data] Fixes tests build with mobile profiles
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4ab98d81cde3d2606051b7190194889d1f13e7b8;p=mono.git

[System.Data] Fixes tests build with mobile profiles
---

diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs
index b13e439b470..829efab65bf 100644
--- a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionConfig.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_CONFIGURATION
+
 using System;
 using System.Collections;
 using System.Configuration;
@@ -110,3 +112,5 @@ namespace MonoTests.System.Data.Connected
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs
index 64ac2e42120..1cf459e1ba8 100644
--- a/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs
@@ -33,7 +33,9 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
 using System.Data.Common;
+#if !NO_ODBC
 using System.Data.Odbc;
+#endif
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
@@ -45,7 +47,6 @@ namespace MonoTests.System.Data.Connected
 	public class ConnectionManager
 	{
 		private static ConnectionManager instance;
-		private ConnectionHolder<OdbcConnection> odbc;
 		private ConnectionHolder<SqlConnection> sql;
 
 		private const string OdbcEnvVar = "SYSTEM_DATA_ODBC";
@@ -63,9 +64,11 @@ namespace MonoTests.System.Data.Connected
 			if (sql != null)
 				CreateMssqlDatabase();
 			
+#if !NO_ODBC
 			odbc = ConnectionHolder<OdbcConnection>.FromEnvVar(OdbcEnvVar);
 			if (odbc != null)
 				CreateMysqlDatabase();
+#endif
 		}
 
 		private void CreateMssqlDatabase()
@@ -82,6 +85,7 @@ namespace MonoTests.System.Data.Connected
 			}
 		}
 
+#if !NO_ODBC
 		private void CreateMysqlDatabase()
 		{
 			DBHelper.ExecuteNonQuery(odbc.Connection, $"CREATE DATABASE {DatabaseName}");
@@ -98,6 +102,7 @@ namespace MonoTests.System.Data.Connected
 				DBHelper.ExecuteNonQuery(odbc.Connection, subQuery);
 			}
 		}
+#endif
 
 		private void DropMssqlDatabase()
 		{
@@ -106,11 +111,13 @@ namespace MonoTests.System.Data.Connected
 			DBHelper.ExecuteNonQuery(sql.Connection, query);
 		}
 
+#if !NO_ODBC
 		private void DropMysqlDatabase()
 		{
 			string query = $"DROP DATABASE [{DatabaseName}]";
 			DBHelper.ExecuteNonQuery(odbc.Connection, query);
 		}
+#endif
 
 		// Split SQL script by "GO" statements
 		private static IEnumerable<string> SplitSqlStatements(string sqlScript)
@@ -125,6 +132,10 @@ namespace MonoTests.System.Data.Connected
 
 		public string DatabaseName { get; }
 
+#if !NO_ODBC
+
+		private ConnectionHolder<OdbcConnection> odbc;
+
 		public ConnectionHolder<OdbcConnection> Odbc
 		{
 			get
@@ -134,6 +145,7 @@ namespace MonoTests.System.Data.Connected
 				return odbc;
 			}
 		}
+#endif
 
 		public ConnectionHolder<SqlConnection> Sql
 		{
@@ -148,7 +160,9 @@ namespace MonoTests.System.Data.Connected
 		public void Close()
 		{
 			sql?.CloseConnection();
+#if !NO_ODBC			
 			odbc?.CloseConnection();
+#endif
 		}
 	}
 
@@ -188,6 +202,9 @@ namespace MonoTests.System.Data.Connected
 
 		public static ConnectionHolder<TConnection> FromEnvVar(string envVarName)
 		{
+#if NO_CONFIGURATION
+			throw new NotImplementedException ();
+#else
 			string variable = Environment.GetEnvironmentVariable(envVarName) ?? string.Empty;
 			var envParts = variable.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
 			if (envParts.Length == 0 || string.IsNullOrEmpty(envParts[0]))
@@ -215,6 +232,7 @@ namespace MonoTests.System.Data.Connected
 				return new ConnectionHolder<TConnection>(connConfig.Engine, factory, connectionString);
 			}
 			throw new InvalidOperationException($"Connection {connectionName} not found");
+#endif
 		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs b/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs
index 118cd668d22..7376505c3bb 100644
--- a/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/Common/EngineConfig.cs
@@ -28,7 +28,6 @@
 //
 
 using System;
-using System.Configuration;
 using System.Globalization;
 using System.Xml;
 
@@ -183,14 +182,14 @@ namespace MonoTests.System.Data.Connected
 			string msg = string.Format (CultureInfo.InvariantCulture,
 					"Invalid value '{0}' for attribute {1}.",
 					value, name);
-			throw new ConfigurationErrorsException (msg, cause, node);
+			throw new ArgumentOutOfRangeException (msg, cause);
 		}
 
 		static Exception CreateAttributeMissingException (string name, XmlNode node)
 		{
 			string msg = string.Format (CultureInfo.InvariantCulture,
 				"Missing '{0}' attribute.", name);
-			throw new ConfigurationErrorsException (msg, node);
+			throw new ArgumentException (msg);
 		}
 	}
 }
diff --git a/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs b/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs
index 2f69eaab1eb..cb3ba28fee1 100644
--- a/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/Common/ProviderTestsConfigurationHandler.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_CONFIGURATION
+
 using System;
 using System.Collections;
 using System.Configuration;
@@ -72,3 +74,5 @@ namespace MonoTests.System.Data.Connected
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
index e6e4578a8e2..35d9fdd7836 100644
--- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs
@@ -32,7 +32,6 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.Odbc;
 using System.Data.SqlClient;
 using System.Data.SqlTypes;
 using System.Globalization;
@@ -42,7 +41,6 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.Connected
 {
 	[TestFixture]
-	[Category ("odbc")]
 	[Category ("sqlserver")]
 	public class DataReaderTest
 	{
@@ -634,7 +632,7 @@ namespace MonoTests.System.Data.Connected
 		[Test]
 		public void GetSchemaTable_Command_Disposed ()
 		{
-			if (RunningOnMono && (conn is OdbcConnection))
+			if (RunningOnMono)
 				Assert.Ignore ("Our statement handle is closed when we dispose the (Odbc)Command");
 
 			IDataReader reader = null;
diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
index 75565aee01d..e93f9fbccab 100644
--- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
@@ -30,7 +30,6 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.Odbc;
 using System.Data.SqlClient;
 using System.Data.SqlTypes;
 using System.Globalization;
@@ -39,7 +38,6 @@ using NUnit.Framework;
 namespace MonoTests.System.Data.Connected
 {
 	[TestFixture]
-	[Category ("odbc")]
 	[Category ("sqlserver")]
 	public class DbDataReaderTest
 	{
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs
index fe91ca26380..4583ca8fe1d 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandBuilderTest.cs
@@ -28,6 +28,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -773,3 +775,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		// FIXME: Add test for ContinueUpdateOnError property
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs
index da40d20a03d..27826d094b6 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcCommandTest.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -295,3 +297,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs
index 09b5a4bf78b..02c7c9a4ca3 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataAdapterTest.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Odbc;
@@ -116,3 +118,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs
index 3dceb1f4603..a91b13eeca4 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcDataReaderTest.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -1134,3 +1136,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs
index 3ddacac3f1c..0cbcad38ec2 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterCollectionTest.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Text;
 using System.Data;
@@ -1204,3 +1206,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs
index 93601aba397..9cb09eac042 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.Odbc/OdbcParameterTest.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -4301,3 +4303,5 @@ namespace MonoTests.System.Data.Connected.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs
index 0e740c9d355..9e03b6c4242 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandBuilderTest.cs
@@ -26,6 +26,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -406,3 +408,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs
index a766cdfff20..21e149e2ac7 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcCommandTest.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Odbc;
@@ -423,3 +425,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
index ba1a851dc0b..0e476dec19c 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
@@ -29,6 +29,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if !NO_ODBC
 using System;
 using System.Collections;
 using System.Data;
@@ -831,3 +832,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs
index 66f2332210a..7c353bc2ec6 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionTest.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Odbc;
@@ -229,3 +231,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs
index 40055d72dad..e06add56875 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcDataAdapterTest.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Data;
 using System.Data.Odbc;
@@ -488,3 +490,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
index 45ee486ce72..e3c97ae3279 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System.Data.Odbc;
 using NUnit.Framework;
 
@@ -47,3 +49,5 @@ namespace MonoTests.System.Data.Odbc
                 }
         }
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs
index ad784688419..17d7086abff 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterCollectionTest.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Text;
 using System.Data;
@@ -78,3 +80,5 @@ namespace MonoTests.System.Data.Odbc
                 }
         }
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs
index 73d2652d85d..2de9c0705e7 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcParameterTest.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using System;
 using System.Text;
 using System.Data;
@@ -68,3 +70,5 @@ namespace MonoTests.System.Data.Odbc
 
         }
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs
index d8f5c5368da..c8975884709 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionAttributeTest.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using NUnit.Framework;
 using System;
 using System.Data;
@@ -171,3 +173,5 @@ namespace MonoTests.System.Data.Odbc {
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs
index 453d171e5ad..41953b2062b 100644
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcPermissionTest.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NO_ODBC
+
 using NUnit.Framework;
 using System;
 using System.Data;
@@ -116,3 +118,5 @@ namespace MonoTests.System.Data.Odbc {
 		}
 	}
 }
+
+#endif
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs
index 922458b7f1a..fce89cd084d 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbCommandTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs
index 4d2b0c4099b..211c4cfffa8 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbConnectionTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs
index 3c906222d7d..220c1b8c29e 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbDataAdapterTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs
index c1efd397354..6becd048ee6 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs
index 0dfa75c3fc2..37e83227df1 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbParameterCollectionTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs
index 22e213f016c..53bf1953fb0 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionAttributeTest.cs
+++ b/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
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs b/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs
index e1f3b325aba..742f73b8356 100644
--- a/mcs/class/System.Data/Test/System.Data.OleDb/OleDbPermissionTest.cs
+++ b/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
\ No newline at end of file