[Title] remove SQLite

[Type] Feature
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem] not support SQLite
[Cause]
[Solution]
[TestCase]

Change-Id: I9c47260d616f2a7efc0c50c5063a4a2c1ed37daa

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index db9268cc75786633eb566f4ac223c540011ff5f8..d7b30bb39a17bfe884e1879e0ddf490b021decd4 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -654,7 +654,6 @@ class BuildServer
        def gen_db()
                hash = DBUtils.dsn_parser @db_dsn
                case hash[:database]
-               when "SQLite3" then puts "SQLite3 DB#{@db_dsn.split(':')[1]} generating"
                when "Mysql" then
 
                        File.open("create_db.txt","w") do |f|
@@ -766,9 +765,6 @@ class BuildServer
                begin
                        if @db_dsn.nil? then
                                return false
-                       elsif @db_dsn =~ /^SQLite3:/ then
-                               @sqlite3_db_mutex.lock
-                               @db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd)
                        else
                                if @db.nil? or not @db.connected? then
                                        @db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd)
@@ -790,12 +786,6 @@ class BuildServer
                rescue => e
                        @log.error e.errstr if not @log.nil?
                        @log.error e.backtrace.inspect if not @log.nil?
-               ensure
-                       if @db_dsn =~ /^SQLite3:/ then
-                               @db.disconnect if @db
-                               @db = nil
-                               @sqlite3_db_mutex.unlock
-                       end
                end
 
                return false

diff --git a/src/build_server/BuildServerController.rb b/src/build_server/BuildServerController.rb
index de7671ace7ddba77d8fd452384dd3d0422cf6c98..488487d46156748160f1d249d37d8bf65ebbd887 100644 (file)
--- a/src/build_server/BuildServerController.rb
+++ b/src/build_server/BuildServerController.rb
@@ -94,8 +94,8 @@ class BuildServerController
                server = get_server(id)
                # if dsn is nil, use default dsn
                if dsn.nil? then
-                       dsn = "SQLite3:#{BuildServer::CONFIG_ROOT}/#{id}/server.db"
-               end     
+                       raise RuntimeError, 'you must set db_dsn'
+               end
                server.db_dsn = dsn
                server.db_user = user if not user.nil?
                server.db_passwd = passwd if not passwd.nil?
@@ -821,17 +821,7 @@ class BuildServerController
                when "CHANGELOG_CHECK"
                        server.changelog_check = value
                when "DB_DSN"
-                       case value
-                       when /^SQLite3:(.*)/i then
-                               if $1.strip.empty? then db_dsn = "SQLite3:#{BuildServer::CONFIG_ROOT}/#{id}/server.db"
-                               else db_dsn = "SQLite3:#{$1.strip}"
-                               end
-                       when /^Mysql:(.*)/i then
-                               db_dsn = "Mysql:#{$1}"
-                       else
-                               db_dsn = "SQLite3:#{BuildServer::CONFIG_ROOT}/#{id}/server.db"
-                       end
-                       server.db_dsn = db_dsn
+                       server.db_dsn = db_dsn if not value.empty?
                when "DB_USER"
                        server.db_user = value if not value.empty?
                when "DB_PASSWORD"
@@ -943,7 +933,7 @@ class BuildServerController
                        if not server.ftp_addr.nil? then
                                f.puts "FTP_URL=ftp://#{server.ftp_username}:#{server.ftp_passwd}@#{server.ftp_addr}:#{server.ftp_port}"
                        end
-                       f.puts "#only supports \"Mysql\" and \"SQLite3\""
+                       f.puts "#only supports \"Mysql\""
                        f.puts "DB_DSN=#{server.db_dsn}"
                        f.puts "DB_USER=#{server.db_user}"
                        f.puts "DB_PASSWORD=#{server.db_passwd}"
@@ -998,16 +988,7 @@ class BuildServerController
                                        ftp_username = ftp_result[2]
                                        ftp_passwd = ftp_result[3]
                                elsif l.start_with?("DB_DSN=")
-                                       case l[idx,length].strip
-                                       when /^SQLite3:(.*)/i then
-                                               if $1.strip.empty? then db_dsn = "SQLite3:#{BuildServer::CONFIG_ROOT}/#{id}/server.db"
-                                               else db_dsn = "SQLite3:#{$1.strip}"
-                                               end
-                                       when /^Mysql:(.*)/i then
-                                               db_dsn = "Mysql:#{$1}"
-                                       else
-                                               db_dsn = nil
-                                       end
+                                       db_dsn = l[idx,length].strip if not l[idx,length].strip.empty?
                                elsif l.start_with?("DB_USER=")
                                        db_user = l[idx,length].strip if not l[idx,length].strip.empty?
                                elsif l.start_with?("DB_PASSWORD=")

diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index a3ae4f312b397ffca5b8bbd8e12d09379d57b025..12a6b0b27f32fda40fbc9dafc4bc633409a295f7 100644 (file)
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -241,11 +241,7 @@ class CommonProject
                        dist_id = row['id']
                        db.do "INSERT INTO projects (distribution_id,name,ptype,status) 
                                VALUES (#{dist_id},'#{@name}','#{@type}','#{@status}')"
-                       case @server.db_dsn
-                       when /^SQLite3:/ then @prj_id = db.select_one("select last_insert_rowid()")[0]
-                       when /^Mysql:/ then @prj_id = db.func(:insert_id)
-                       else @prj_id = db.select_one("select last_insert_rowid()")[0]
-                       end
+                       @prj_id = db.func(:insert_id)
                        @os_list.each do |os|
                                row = db.select_one("SELECT * FROM supported_os WHERE name='#{os}'")
                                os_id = row['id']

diff --git a/test/build-server.basic2/build-svr-01.testcase b/test/build-server.basic2/build-svr-01.testcase
index f9617b18d63f1bc26a0f241c00dccb473e82ff86..026d6a8c22932c3a36c9d0b3fb8c0e3c047cb340 100644 (file)
--- a/test/build-server.basic2/build-svr-01.testcase
+++ b/test/build-server.basic2/build-svr-01.testcase
@@ -4,6 +4,8 @@ rm -rf buildsvr01
 mkdir buildsvr01
 #EXEC
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #POST-EXEC
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01

diff --git a/test/build-server.basic2/build-svr-03.testcase b/test/build-server.basic2/build-svr-03.testcase
index c018e1bc4b1ae0c3a58ab5a49a9f6fbf48922b78..3f1f830dd5cc62bc91fb9404cd5ab62ec87a00d5 100644 (file)
--- a/test/build-server.basic2/build-svr-03.testcase
+++ b/test/build-server.basic2/build-svr-03.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 
 #EXEC
 ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2223

diff --git a/test/build-server.basic2/build-svr-04.testcase b/test/build-server.basic2/build-svr-04.testcase
index 985f5116852c6e74ed932ca89c3571c2e021fd96..07f76a8f19289f180b589f13100eeb2fc2dc883b 100644 (file)
--- a/test/build-server.basic2/build-svr-04.testcase
+++ b/test/build-server.basic2/build-svr-04.testcase
@@ -3,6 +3,8 @@ rm -rf ~/.build_tools/build_server/testserver3
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #EXEC
 echo "TEST_TIME=3" >> ~/.build_tools/build_server/testserver3/server.cfg
 ../../build-svr start -n testserver3 -p 2223

diff --git a/test/build-server.basic2/build-svr-05.testcase b/test/build-server.basic2/build-svr-05.testcase
index e26bc5f905f98f6c2f950db8d9db968a71a008b0..82cd7f944f48ff6ea1d8a8141c654b315cf59403 100644 (file)
--- a/test/build-server.basic2/build-svr-05.testcase
+++ b/test/build-server.basic2/build-svr-05.testcase
@@ -2,7 +2,9 @@
 mkdir buildsvr01
 rm -rf ~/.build_tools/build_server/testserver3
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 ../../build-svr start -n testserver3 -p 2223 &
 #EXEC

diff --git a/test/build-server.basic2/build-svr-06.testcase b/test/build-server.basic2/build-svr-06.testcase
index 421fbf070cb9a9a35999d436e5729194dd341b13..fbac9abe2c7664f7bf95e2f1828ef95bc0238a0c 100644 (file)
--- a/test/build-server.basic2/build-svr-06.testcase
+++ b/test/build-server.basic2/build-svr-06.testcase
@@ -1,7 +1,7 @@
 #PRE-EXEC
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 #EXEC
 ../../build-svr stop -n testserver3
 #POST-EXEC

diff --git a/test/build-server.basic2/build-svr-11.testcase b/test/build-server.basic2/build-svr-11.testcase
index 3e6f3bc1b53cdedb4bd76150678a467a51e82336..75a49ab42162140c94a1ab42f99d7d2ee17f8062 100644 (file)
--- a/test/build-server.basic2/build-svr-11.testcase
+++ b/test/build-server.basic2/build-svr-11.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 #EXEC

diff --git a/test/build-server.basic2/build-svr-13.testcase b/test/build-server.basic2/build-svr-13.testcase
index c00d8235382ac51f2308a1c570efd67a87668634..a9358a80178b98f536cd8d7421daad8749e6051e 100644 (file)
--- a/test/build-server.basic2/build-svr-13.testcase
+++ b/test/build-server.basic2/build-svr-13.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 #EXEC
 ../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch -w 1111

diff --git a/test/build-server.basic2/build-svr-14.testcase b/test/build-server.basic2/build-svr-14.testcase
index fff93a445aa51d8615f8195baf62ca252a145817..3f5d14c6efd45f9e3bdd674957af11953c47f737 100644 (file)
--- a/test/build-server.basic2/build-svr-14.testcase
+++ b/test/build-server.basic2/build-svr-14.testcase
@@ -3,7 +3,9 @@ rm -rf buildsvr01
 rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 #EXEC

diff --git a/test/build-server.basic2/build-svr-15.testcase b/test/build-server.basic2/build-svr-15.testcase
index 734b5a7baa61ad4f0cebcc2c9b40f9a54adabfc0..bb383876514399499b9f60fe4290b60749aec421 100644 (file)
--- a/test/build-server.basic2/build-svr-15.testcase
+++ b/test/build-server.basic2/build-svr-15.testcase
@@ -2,6 +2,8 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #EXEC
 ../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip
 #POST-EXEC

diff --git a/test/build-server.basic2/build-svr-16.testcase b/test/build-server.basic2/build-svr-16.testcase
index b5fe4fc09428021de4a2939b8e6135622ac43dbd..45405fe23382464722442123d706dbe3f0c4bfd6 100644 (file)
--- a/test/build-server.basic2/build-svr-16.testcase
+++ b/test/build-server.basic2/build-svr-16.testcase
@@ -2,6 +2,8 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 ../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip
 #EXEC
 ../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip

diff --git a/test/build-server.basic2/build-svr-17.testcase b/test/build-server.basic2/build-svr-17.testcase
index 02b86bf66370465126c8f3961980aebd585e9b5e..cb2330342c446957d5d91d7868ad0f344908a907 100644 (file)
--- a/test/build-server.basic2/build-svr-17.testcase
+++ b/test/build-server.basic2/build-svr-17.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 #EXEC
 ../../build-svr add-os -n testserver3 -o ubuntu-32

diff --git a/test/build-server.basic2/build-svr-18.testcase b/test/build-server.basic2/build-svr-18.testcase
index 2adde9c97486ee2c163db917b3bf5e3de07776bc..acc05cef69b6d7ae6a5cfab7e1f4fdce299605e8 100644 (file)
--- a/test/build-server.basic2/build-svr-18.testcase
+++ b/test/build-server.basic2/build-svr-18.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 #EXEC
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 ../../build-svr add-os -n testserver3 -o ubuntu-32

diff --git a/test/build-server.basic2/build-svr-19.testcase b/test/build-server.basic2/build-svr-19.testcase
index 9176c145fe91913b9e1acf3d7ba0cedef93a064b..c5899b375907d698f78d6a69f7f7b5a5429cecb8 100644 (file)
--- a/test/build-server.basic2/build-svr-19.testcase
+++ b/test/build-server.basic2/build-svr-19.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 ../../build-svr add-os -n testserver3 -o windows-32
 #EXEC

diff --git a/test/build-server.basic2/build-svr-20.testcase b/test/build-server.basic2/build-svr-20.testcase
index 61be17e762a295506709c91c94d4cdcf0aabd929..21396223d2fc548f7777694d92f0cad48d6ea6ec 100644 (file)
--- a/test/build-server.basic2/build-svr-20.testcase
+++ b/test/build-server.basic2/build-svr-20.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@172.21.111.124
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 ../../build-svr add-prj -n testserver3 -N bin -P bin -o ubuntu-32

diff --git a/test/build-server.basic2/build-svr-21.testcase b/test/build-server.basic2/build-svr-21.testcase
index ae9258aa16bbce03d401e24c212106659622ed2b..5c1f166988748fd59b6b49247a7cbe34a1d9bcce 100644 (file)
--- a/test/build-server.basic2/build-svr-21.testcase
+++ b/test/build-server.basic2/build-svr-21.testcase
@@ -2,7 +2,9 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 #EXEC
 ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 3
 ../../build-svr get-attr -n testserver3 -A MAX_WORKING_JOBS

diff --git a/test/build-server.basic2/build-svr-23.testcase b/test/build-server.basic2/build-svr-23.testcase
index 87649e93897efddc64a89b202268b103ade453bb..b80ac78556f2b2574d45426a31545b0ee9ddb834 100644 (file)
--- a/test/build-server.basic2/build-svr-23.testcase
+++ b/test/build-server.basic2/build-svr-23.testcase
@@ -2,6 +2,8 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #EXEC
 ../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 ../../build-svr remove-dist -n testserver3 -D BASE

diff --git a/test/build-server.basic2/build-svr-24.testcase b/test/build-server.basic2/build-svr-24.testcase
index 895215aa866bfa7a953e4a428edbaf7aa773f32e..fae8f82c97519bb9633c557a5a599f5f554cdddf 100644 (file)
--- a/test/build-server.basic2/build-svr-24.testcase
+++ b/test/build-server.basic2/build-svr-24.testcase
@@ -2,6 +2,8 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #EXEC
 ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 3
 ../../build-svr get-attr -n testserver3 -A MAX_WORKING_JOBS

diff --git a/test/build-server.basic2/build-svr-25.testcase b/test/build-server.basic2/build-svr-25.testcase
index ef0ab7de461a22156c9394f967d3cc9779a9d0fc..69b68fbd52c056c17eb53c4448b7985fa0f08f06 100644 (file)
--- a/test/build-server.basic2/build-svr-25.testcase
+++ b/test/build-server.basic2/build-svr-25.testcase
@@ -3,6 +3,8 @@
 rm -rf buildsvr01
 mkdir buildsvr01
 cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
 #EXEC
 ../../build-svr get-attr -n testserver3 -A MAX_JOBS
 ../../build-svr set-attr -n testserver3 -A MAX_JOBS -V 3

diff --git a/test/build-server.multi_dist1/build-svr2-01.testcase b/test/build-server.multi_dist1/build-svr2-01.testcase
index e54b8163231dbf486ec1eb2588f98412537fac12..fa7802a04ce539bbc7e766655f715c2d51eef6fa 100644 (file)
--- a/test/build-server.multi_dist1/build-svr2-01.testcase
+++ b/test/build-server.multi_dist1/build-svr2-01.testcase
@@ -3,7 +3,9 @@ rm -rf buildsvr01
 rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01;../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
-cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn SQLite3:`pwd`/server.db
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+cd buildsvr01; ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
 ../../build-svr add-os -n testserver3 -o ubuntu-32
 ../../build-svr add-os -n testserver3 -o ubuntu-64
 #EXEC