@@ -18,24 +18,24 @@ def run_without_aborting(*tasks)
18
18
abort "Errors running #{ errors . join ( ', ' ) } " if errors . any?
19
19
end
20
20
21
- desc "Run mysql2, sqlite, and postgresql tests by default"
21
+ desc "Run mysql2, trilogy, sqlite, and postgresql tests by default"
22
22
task default : :test
23
23
24
24
task :package
25
25
26
- desc "Run mysql2, sqlite, and postgresql tests"
26
+ desc "Run mysql2, trilogy, sqlite, and postgresql tests"
27
27
task :test do
28
28
tasks = defined? ( JRUBY_VERSION ) ?
29
29
%w( test_jdbcmysql test_jdbcsqlite3 test_jdbcpostgresql ) :
30
- %w( test_mysql2 test_sqlite3 test_postgresql )
30
+ %w( test_mysql2 test_trilogy test_sqlite3 test_postgresql )
31
31
run_without_aborting ( *tasks )
32
32
end
33
33
34
34
namespace :test do
35
35
task :isolated do
36
36
tasks = defined? ( JRUBY_VERSION ) ?
37
37
%w( isolated_test_jdbcmysql isolated_test_jdbcsqlite3 isolated_test_jdbcpostgresql ) :
38
- %w( isolated_test_mysql2 isolated_test_sqlite3 isolated_test_postgresql )
38
+ %w( isolated_test_mysql2 isolated_test_trilogy isolated_test_sqlite3 isolated_test_postgresql )
39
39
run_without_aborting ( *tasks )
40
40
end
41
41
@@ -56,18 +56,19 @@ namespace :db do
56
56
task drop : [ "db:mysql:drop" , "db:postgresql:drop" ]
57
57
end
58
58
59
- %w( mysql2 postgresql sqlite3 sqlite3_mem oracle jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb ) . each do |adapter |
59
+ %w( mysql2 trilogy postgresql sqlite3 sqlite3_mem oracle jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb ) . each do |adapter |
60
60
namespace :test do
61
61
Rake ::TestTask . new ( adapter => "#{ adapter } :env" ) do |t |
62
62
adapter_short = adapter [ /^[a-z0-9]+/ ]
63
63
t . libs << "test"
64
64
files = ( FileList [ "test/cases/**/*_test.rb" ] . reject {
65
65
|x | x . include? ( "/adapters/" ) || x . include? ( "/encryption/performance" )
66
66
} + FileList [ "test/cases/adapters/#{ adapter_short } /**/*_test.rb" ] )
67
- files = files + FileList [ "test/cases/adapters/abstract_mysql_adapter/**/*_test.rb" ] if adapter == "mysql2"
67
+ files = files + FileList [ "test/cases/adapters/abstract_mysql_adapter/**/*_test.rb" ] if [ "mysql2" , "trilogy" ] . include? ( adapter )
68
68
69
69
t . test_files = files
70
70
71
+ t . test_files = files
71
72
t . warning = true
72
73
t . verbose = true
73
74
t . ruby_opts = [ "--dev" ] if defined? ( JRUBY_VERSION )
0 commit comments