Skip to content

Commit 6f056a8

Browse files
Use NuGet for database tests when possible
* FirebirdSql.Data.FirebirdClient * Microsoft.SqlServer.Compact * MySql.Data * Npgsql (3.2.4.1, due to 3.2.5 no more supporting NHibernate closing connection from distributed transaction second phase: maybe we should add a condition for not testing that instead) * Oracle.ManagedDataAccess (12.1.2400, newer versions (at least up to 12.2.1100) fail NH-1171 tests, apparently due to some old Oracle bug striking back https://stackoverflow.com/a/7542670/1178314 ) * System.Data.SQLite.Core Folder available-test-configurations of NH devs need to be cleaned accordingly. (Remove binaries matching those packages.)
1 parent 854cc61 commit 6f056a8

39 files changed

+65
-8242
lines changed

ShowBuildMenu.bat

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,26 @@ if errorlevel 0 goto test-setup-menu
4444

4545
:test-setup-menu
4646
echo A. Add a test configuration for SQL Server.
47-
echo B. Add a test configuration for Firebird (x86).
48-
echo C. Add a test configuration for Firebird (x64). [not recommended]
49-
echo D. Add a test configuration for SQLite (x86).
50-
echo E. Add a test configuration for SQLite (x64). [not recommended]
51-
echo F. Add a test configuration for PostgreSQL.
52-
echo G. Add a test configuration for Oracle.
53-
echo H. Add a test configuration for SQL Server Compact (x86).
54-
echo I. Add a test configuration for SQL Server Compact (x64).
55-
echo J. Add a test configuration for MySql.
47+
echo B. Add a test configuration for Firebird.
48+
echo C. Add a test configuration for SQLite.
49+
echo D. Add a test configuration for PostgreSQL.
50+
echo E. Add a test configuration for Oracle.
51+
echo F. Add a test configuration for Oracle with managed driver.
52+
echo G. Add a test configuration for SQL Server Compact.
53+
echo H. Add a test configuration for MySql.
5654
echo.
5755
echo X. Exit to main menu.
5856
echo.
5957

60-
%BUILDTOOL% prompt ABCDEFGHIJX
61-
if errorlevel 10 goto main-menu
62-
if errorlevel 9 goto test-setup-mysql
63-
if errorlevel 8 goto test-setup-sqlservercex64
64-
if errorlevel 7 goto test-setup-sqlservercex86
65-
if errorlevel 6 goto test-setup-oracle
66-
if errorlevel 5 goto test-setup-postgresql
67-
if errorlevel 4 goto test-setup-sqlitex64
68-
if errorlevel 3 goto test-setup-sqlitex86
69-
if errorlevel 2 goto test-setup-firebirdx64
70-
if errorlevel 1 goto test-setup-firebirdx86
58+
%BUILDTOOL% prompt ABCDEFGHX
59+
if errorlevel 8 goto main-menu
60+
if errorlevel 7 goto test-setup-mysql
61+
if errorlevel 6 goto test-setup-sqlserverce
62+
if errorlevel 5 goto test-setup-oracle-managed
63+
if errorlevel 4 goto test-setup-oracle
64+
if errorlevel 3 goto test-setup-postgresql
65+
if errorlevel 2 goto test-setup-sqlite
66+
if errorlevel 1 goto test-setup-firebird
7167
if errorlevel 0 goto test-setup-sqlserver
7268

7369
:test-setup-sqlserver
@@ -77,59 +73,38 @@ set LIB_FILES=
7773
set LIB_FILES2=
7874
goto test-setup-generic
7975

80-
:test-setup-sqlservercex86
81-
set CONFIG_NAME=SqlServerCe32
76+
:test-setup-sqlserverce
77+
set CONFIG_NAME=SqlServerCe
8278
set TEST_PLATFORM=AnyCPU
83-
set LIB_FILES=lib\teamcity\SqlServerCe\*.dll
84-
set LIB_FILES2=lib\teamcity\SqlServerCe\X86\*.dll
85-
goto test-setup-generic
86-
87-
:test-setup-sqlservercex64
88-
set CONFIG_NAME=SqlServerCe64
89-
set TEST_PLATFORM=AnyCPU
90-
set LIB_FILES=lib\teamcity\sqlServerCe\*.dll
91-
set LIB_FILES2=lib\teamcity\sqlServerCe\AMD64\*.dll
92-
goto test-setup-generic
93-
94-
:test-setup-firebirdx86
95-
set CONFIG_NAME=FireBird
96-
set TEST_PLATFORM=x86
97-
set LIB_FILES=lib\teamcity\firebird\*.dll
79+
set LIB_FILES=
9880
set LIB_FILES2=
9981
goto test-setup-generic
10082

101-
:test-setup-firebirdx64
83+
:test-setup-firebird
10284
set CONFIG_NAME=FireBird
103-
set TEST_PLATFORM=x64
104-
set LIB_FILES=lib\teamcity\firebird\*.dll
105-
set LIB_FILES2=
106-
goto test-setup-generic
107-
108-
:test-setup-sqlitex86
109-
set CONFIG_NAME=SQLite
110-
set TEST_PLATFORM=x86
111-
set LIB_FILES=lib\teamcity\sqlite\x86\*
85+
set TEST_PLATFORM=AnyCPU
86+
set LIB_FILES=
11287
set LIB_FILES2=
11388
goto test-setup-generic
11489

115-
:test-setup-sqlitex64
90+
:test-setup-sqlite
11691
set CONFIG_NAME=SQLite
117-
set TEST_PLATFORM=x64
118-
set LIB_FILES=lib\teamcity\sqlite\x64\*
92+
set TEST_PLATFORM=AnyCPU
93+
set LIB_FILES=
11994
set LIB_FILES2=
12095
goto test-setup-generic
12196

12297
:test-setup-postgresql
12398
set CONFIG_NAME=PostgreSQL
12499
set TEST_PLATFORM=AnyCPU
125-
set LIB_FILES=lib\teamcity\postgresql\*.dll
100+
set LIB_FILES=
126101
set LIB_FILES2=
127102
goto test-setup-generic
128103

129104
:test-setup-mysql
130105
set CONFIG_NAME=MySql
131106
set TEST_PLATFORM=AnyCPU
132-
set LIB_FILES=lib\teamcity\mysql\*.dll
107+
set LIB_FILES=
133108
set LIB_FILES2=
134109
goto test-setup-generic
135110

@@ -140,6 +115,13 @@ set LIB_FILES=lib\teamcity\oracle\x86\*.dll
140115
set LIB_FILES2=
141116
goto test-setup-generic
142117

118+
:test-setup-oracle-managed
119+
set CONFIG_NAME=Oracle-Managed
120+
set TEST_PLATFORM=AnyCPU
121+
set LIB_FILES=
122+
set LIB_FILES2=
123+
goto test-setup-generic
124+
143125
:test-setup-generic
144126
set CFGNAME=
145127
set /p CFGNAME=Enter a name for your test configuration or press enter to use default name:
Binary file not shown.

lib/teamcity/mysql/mysql.data.dll

-415 KB
Binary file not shown.

lib/teamcity/oracle-managed/common/Oracle.ManagedDataAccess.Catalog.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)