diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-06 10:25:03 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-06 10:25:03 +0000 |
| commit | a7250c41e25e40c25faefc637e0680d12fda38a0 (patch) | |
| tree | 05a99f415ec4c12c6a054749f94624e1b102c950 /lib | |
| parent | 7c45396d92218ed605ceaeeb3dce3c368dde0391 (diff) | |
| download | redmine-a7250c41e25e40c25faefc637e0680d12fda38a0.tar.gz redmine-a7250c41e25e40c25faefc637e0680d12fda38a0.zip | |
Merged r9339 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9340 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/ci.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 06d03ae73..05d369788 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -48,8 +48,8 @@ namespace :ci do test_conf = { 'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), 'database' => test_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins', 'encoding' => 'utf8' } when 'postgresql' raise "Error creating databases" unless - system(%|psql -U jenkins -d postgres -c "create database #{dev_db_name} owner jenkins encoding 'UTF8';|) && - system(%|psql -U jenkins -d postgres -c "create database #{test_db_name} owner jenkins encoding 'UTF8';|) + system(%|psql -U jenkins -d postgres -c "create database #{dev_db_name} owner jenkins encoding 'UTF8';"|) && + system(%|psql -U jenkins -d postgres -c "create database #{test_db_name} owner jenkins encoding 'UTF8';"|) dev_conf = { 'adapter' => 'postgresql', 'database' => dev_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins' } test_conf = { 'adapter' => 'postgresql', 'database' => test_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins' } when 'sqlite3' |