[Title] mysql apply to test case

[Type] Enhancement
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I89501e3e3e2ccfab5041781ae30e72068a4ad512

diff --git a/test/build-server.basic1/buildsvr.init b/test/build-server.basic1/buildsvr.init
index 41877633526871dd502b1101a1a056c3f3f0b26b..72cf1fe88b3c42840e9e1aaa67e408598bbcde77 100755 (executable)
--- a/test/build-server.basic1/buildsvr.init
+++ b/test/build-server.basic1/buildsvr.init
@@ -2,6 +2,14 @@
 if [ "x${RUBY}" = "x" ] ;then
     RUBY="ruby -d"
 fi
+
+if [ ! "$DB_PASSWD" ] ; then
+       read -p "Insert DB password: " input
+       export DB_PASSWD=$input
+else
+       echo $DB_PASSWD
+fi
+
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -11,7 +19,10 @@ rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01
 ${RUBY} ../../../build-svr create -n testserver3
-${RUBY} ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword ehdgml
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+${RUBY} ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
+rm -f a
 cd ..
 ${RUBY} ../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
 ${RUBY} ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224

diff --git a/test/build-server.multi-svr1/buildsvr1.init b/test/build-server.multi-svr1/buildsvr1.init
index 585b43bffc0707bd5f553ef187e1ce6fdd3d885e..9b0af28c15c2948d21a3bf615229a0dffc1d9ea2 100755 (executable)
--- a/test/build-server.multi-svr1/buildsvr1.init
+++ b/test/build-server.multi-svr1/buildsvr1.init
@@ -3,6 +3,14 @@ if [ "x${RUBY}" = "x" ] ;then
     RUBY="ruby -d"
 fi
 
+if [ ! "$DB_PASSWD" ] ; then
+       echo -n "insert Mysql password : "
+       read input
+       export DB_PASSWD=$input
+else
+       echo $DB_PASSWD
+fi
+
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -12,6 +20,10 @@ rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01
 ${RUBY} ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+${RUBY} ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
+rm -f a
 cd ..
 
 ${RUBY} ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333

diff --git a/test/build-server.multi-svr1/buildsvr2.init b/test/build-server.multi-svr1/buildsvr2.init
index 61caf8394e79486a4837f8df99e9d3067e0884fb..56b8da51394c48ead80a8d53a2d8a8ba6151772c 100755 (executable)
--- a/test/build-server.multi-svr1/buildsvr2.init
+++ b/test/build-server.multi-svr1/buildsvr2.init
@@ -2,12 +2,24 @@
 if [ "x${RUBY}" = "x" ] ;then
     RUBY="ruby -d"
 fi
+
+if [ ! "$DB_PASSWD" ] ; then
+       read -p "Insert DB password: " input
+       export DB_PASSWD=$input
+else
+       echo $DB_PASSWD
+fi
+
 rm -rf buildsvr02
 
 ../../build-svr remove -n testserver4
 mkdir buildsvr02
 cd buildsvr02
 ${RUBY} ../../../build-svr create -n testserver4
+echo "DROP DATABASE testserver4;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+${RUBY} ../../../build-svr migrate -n testserver4 --dsn Mysql:testserver4:localhost --dbuser root --dbpassword $DB_PASSWD
+rm -f a
 cd ..
 ${RUBY} ../../build-svr add-dist -n testserver4 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
 

diff --git a/test/build-server.multi-svr2/buildsvr.init b/test/build-server.multi-svr2/buildsvr.init
index d0199b5df3c72e4f467718c3d28401580c551729..b0859c98c700fcdcd7dbea2609ff79dd5aafda0d 100755 (executable)
--- a/test/build-server.multi-svr2/buildsvr.init
+++ b/test/build-server.multi-svr2/buildsvr.init
@@ -3,6 +3,13 @@ if [ "x${RUBY}" = "x" ] ;then
     RUBY="ruby -d"
 fi
 
+if [ ! "$DB_PASSWD" ] ; then
+       read -p "Insert DB password: " input
+       export DB_PASSWD=$input
+else
+       echo $DB_PASSWD
+fi
+
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -12,6 +19,10 @@ rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01
 ${RUBY} ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+${RUBY} ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
+rm -f a
 cd ..
 
 ${RUBY} ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333

diff --git a/test/build-server.multi_dist2/buildsvr.init b/test/build-server.multi_dist2/buildsvr.init
index 0c700245bbd794cb6d93523da181036dbac8e576..5d4bc035c0dbe0670faacefe2f18d93761bb4d39 100755 (executable)
--- a/test/build-server.multi_dist2/buildsvr.init
+++ b/test/build-server.multi_dist2/buildsvr.init
@@ -2,6 +2,14 @@
 if [ "x${RUBY}" = "x" ] ;then
     RUBY="ruby -d"
 fi
+
+if [ ! "$DB_PASSWD" ] ; then
+       read -p "Insert DB password: " input
+       export DB_PASSWD=$input
+else
+       echo $DB_PASSWD
+fi
+
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -11,6 +19,10 @@ rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 cd buildsvr01
 ${RUBY} ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
+echo "DROP DATABASE testserver3;" > a
+mysql -u root -p --password=$DB_PASSWD -h localhost < a
+${RUBY} ../../../build-svr migrate -n testserver3 --dsn Mysql:testserver3:localhost --dbuser root --dbpassword $DB_PASSWD
+rm -f a
 cd ..
 
 ${RUBY} ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333