NH-4008 - Switch tests to using split up driver packages.

Author: ngbrown

ShowBuildMenu.bat

@@ -15,7 +15,7 @@ echo.
 echo --- TESTING ---
 echo B. (Step 1) Set up a new test configuration for a particular database.
 echo C. (Step 2) Activate a test configuration.
-echo D. (Step 3) Run tests using active configuration.
+echo D. (Step 3) Run tests using active configuration (Build in Visual Studio).
 echo.
 echo --- BUILD ---
 echo E. Build NHibernate (Debug)
@@ -76,49 +76,49 @@ goto test-setup-generic
 :test-setup-sqlservercex86
 set CONFIG_NAME=SqlServerCe32
 set PLATFORM=AnyCPU
-set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
-set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
+set LIB_FILES=
+set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-sqlservercex64
 set CONFIG_NAME=SqlServerCe64
 set PLATFORM=AnyCPU
-set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
-set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
+set LIB_FILES=
+set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-firebirdx86
 set CONFIG_NAME=FireBird
 set PLATFORM=x86
-set LIB_FILES=lib\teamcity\firebird\*.dll
-set LIB_FILES2=lib\teamcity\firebird\x86\*
+set LIB_FILES=lib\teamcity\firebird\x86\*
+set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-firebirdx64
 set CONFIG_NAME=FireBird
 set PLATFORM=x64
-set LIB_FILES=lib\teamcity\firebird\*.dll
-set LIB_FILES2=lib\teamcity\firebird\x64\*
+set LIB_FILES=lib\teamcity\firebird\x64\*
+set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-sqlitex86
 set CONFIG_NAME=SQLite
 set PLATFORM=x86
-set LIB_FILES=lib\teamcity\sqlite\x86\*
+set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-sqlitex64
 set CONFIG_NAME=SQLite
 set PLATFORM=x64
-set LIB_FILES=lib\teamcity\sqlite\x64\*
+set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
 :test-setup-postgresql
 set CONFIG_NAME=PostgreSQL
 set PLATFORM=AnyCPU
-set LIB_FILES=lib\teamcity\postgresql\*.dll
+set LIB_FILES=
 set LIB_FILES2=
 goto test-setup-generic
 
@@ -158,7 +158,9 @@ echo Configuration activated.
 goto main-menu
 
 :test-run
-start "nunit3-console" cmd /K %NUNIT% --x86 --agents=1 --process=separate NHibernate.nunit
+SET NUNITPLATFORM=
+IF /I "%PLATFORM%" NEQ "x64" set NUNITPLATFORM=--x86
+start "nunit3-console" cmd /K %NUNIT% %NUNITPLATFORM% --agents=1 --process=separate NHibernate.nunit
 goto main-menu
 
 rem :build-test

build-common/nhibernate-properties.xml

@@ -2,6 +2,6 @@
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
 	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect"  overwrite="false"/>
 	<property name="nhibernate.command_timeout" value="444"  overwrite="false"/>
-	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>

build-common/teamcity-hibernate.cfg.xml

@@ -15,7 +15,7 @@
 			<property name="format_sql">true</property>
 
 			<!-- This is the System.Data.dll provider for MSSQL Server -->
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver, NHibernate.Driver.SqlClient</property>
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 			<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
 			<property name="show_sql">false</property>