[Title] Modified test script for support other ruby interpreter

diff --git a/test/build-server.basic1/buildsvr.init b/test/build-server.basic1/buildsvr.init
index 2dc34b0868028e72cf4f2f429fbdceacac8b51eb..354c0ce6c4b412630dd7c7e9be2e0164b26dbf46 100755 (executable)
--- a/test/build-server.basic1/buildsvr.init
+++ b/test/build-server.basic1/buildsvr.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -8,18 +10,18 @@ rm -rf ~/.build_tools/build_server/testserver3
 ../../build-svr remove -n testserver3
 mkdir buildsvr01
 cd buildsvr01
-../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
+${RUBY} ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333
 cd ..
 
-../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224
-../../build-svr add-os -n testserver3 -o ubuntu-32
-../../build-svr add-os -n testserver3 -o windows-32
-../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
-../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
-../../build-svr add-prj -n testserver3 -N testc -g `pwd`/git01/c -b master -w 1111
-../../build-svr add-prj -n testserver3 -N testd -g `pwd`/git01/d -b master -o ubuntu-32
-../../build-svr add-prj -n testserver3 -N teste -P bin
-../../build-svr add-prj -n testserver3 -N testa1 -g `pwd`/git01/a1 -b master
+${RUBY} ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224
+${RUBY} ../../build-svr add-os -n testserver3 -o ubuntu-32
+${RUBY} ../../build-svr add-os -n testserver3 -o windows-32
+${RUBY} ../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testc -g `pwd`/git01/c -b master -w 1111
+${RUBY} ../../build-svr add-prj -n testserver3 -N testd -g `pwd`/git01/d -b master -o ubuntu-32
+${RUBY} ../../build-svr add-prj -n testserver3 -N teste -P bin
+${RUBY} ../../build-svr add-prj -n testserver3 -N testa1 -g `pwd`/git01/a1 -b master
 
 mkdir -p git01
 cp ../git01/*.tar.gz git01/
@@ -39,6 +41,6 @@ cd ..
 mkdir -p bin
 cp ../bin/* bin/
 
-../../pkg-svr register -n pkgsvr01 -d unstable -P bin/bin_0.0.0_ubuntu-32.zip
+${RUBY} ../../pkg-svr register -n pkgsvr01 -d unstable -P bin/bin_0.0.0_ubuntu-32.zip
 
-ruby -d ../../build-svr start -n testserver3 -p 2223 --CHILD
+${RUBY}  ../../build-svr start -n testserver3 -p 2223 --CHILD

diff --git a/test/build-server.basic1/pkgsvr.init b/test/build-server.basic1/pkgsvr.init
index 26c9ef6be351d68898b88ff8a4b55e82be83356d..6973d9e2f2c9407d564212788bd89a66139e8179 100755 (executable)
--- a/test/build-server.basic1/pkgsvr.init
+++ b/test/build-server.basic1/pkgsvr.init
@@ -1,7 +1,10 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+       RUBY="ruby -d"
+fi
 rm -rf ~/.build_tools/pkg_server/pkgsvr01
 rm -rf `pwd`/pkgsvr01
-ruby -d ../../pkg-svr create -n pkgsvr01 -d unstable
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
-ruby -d ../../pkg-svr start -n pkgsvr01 -p 3333
+${RUBY} ../../pkg-svr create -n pkgsvr01 -d unstable
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
+${RUBY} ../../pkg-svr start -n pkgsvr01 -p 3333

diff --git a/test/build-server.multi-svr1/buildsvr1.init b/test/build-server.multi-svr1/buildsvr1.init
index c6194fd499b49124edc670b6052af21e605c7490..585b43bffc0707bd5f553ef187e1ce6fdd3d885e 100755 (executable)
--- a/test/build-server.multi-svr1/buildsvr1.init
+++ b/test/build-server.multi-svr1/buildsvr1.init
@@ -1,4 +1,7 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 
 rm -rf buildsvr01
 rm -rf git01
@@ -8,16 +11,16 @@ rm -rf ~/.build_tools/build_server/testserver3
 ../../build-svr remove -n testserver3
 mkdir buildsvr01
 cd buildsvr01
-ruby -d ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
+${RUBY} ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
 cd ..
 
-ruby -d ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
-ruby -d ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224
-ruby -d ../../build-svr add-os -n testserver3 -o ubuntu-32
-ruby -d ../../build-svr add-os -n testserver3 -o windows-32
-ruby -d ../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
-ruby -d ../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
-ruby -d ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 0
+${RUBY} ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
+${RUBY} ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224
+${RUBY} ../../build-svr add-os -n testserver3 -o ubuntu-32
+${RUBY} ../../build-svr add-os -n testserver3 -o windows-32
+${RUBY} ../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
+${RUBY} ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 0
 
 mkdir -p git01
 cp ../git01/*.tar.gz git01/
@@ -28,4 +31,4 @@ tar xvf a_v1.tar.gz
 tar xvf b_v1.tar.gz
 cd ..
 
-ruby -d ../../build-svr start -n testserver3 -p 2223 --CHILD
+${RUBY} ../../build-svr start -n testserver3 -p 2223 --CHILD

diff --git a/test/build-server.multi-svr1/buildsvr2.init b/test/build-server.multi-svr1/buildsvr2.init
index c5ab0698bfbf8d32f45c0ca488ae11fb055fd5f5..61caf8394e79486a4837f8df99e9d3067e0884fb 100755 (executable)
--- a/test/build-server.multi-svr1/buildsvr2.init
+++ b/test/build-server.multi-svr1/buildsvr2.init
@@ -1,11 +1,14 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 rm -rf buildsvr02
 
 ../../build-svr remove -n testserver4
 mkdir buildsvr02
 cd buildsvr02
-ruby -d ../../../build-svr create -n testserver4
+${RUBY} ../../../build-svr create -n testserver4
 cd ..
-ruby -d ../../build-svr add-dist -n testserver4 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
+${RUBY} ../../build-svr add-dist -n testserver4 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
 
-ruby -d ../../build-svr start -n testserver4 -p 2224 --CHILD
+${RUBY} ../../build-svr start -n testserver4 -p 2224 --CHILD

diff --git a/test/build-server.multi-svr1/pkgsvr.init b/test/build-server.multi-svr1/pkgsvr.init
index 26c9ef6be351d68898b88ff8a4b55e82be83356d..0cc21e349fce34ae29f46847467b61c8cecdfbd1 100755 (executable)
--- a/test/build-server.multi-svr1/pkgsvr.init
+++ b/test/build-server.multi-svr1/pkgsvr.init
@@ -1,7 +1,10 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 rm -rf ~/.build_tools/pkg_server/pkgsvr01
 rm -rf `pwd`/pkgsvr01
-ruby -d ../../pkg-svr create -n pkgsvr01 -d unstable
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
-ruby -d ../../pkg-svr start -n pkgsvr01 -p 3333
+${RUBY} ../../pkg-svr create -n pkgsvr01 -d unstable
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
+${RUBY} ../../pkg-svr start -n pkgsvr01 -p 3333

diff --git a/test/build-server.multi_dist2/buildsvr.init b/test/build-server.multi_dist2/buildsvr.init
index cdc9f6a59a7691385df8f387fb00bcfda8740805..0c700245bbd794cb6d93523da181036dbac8e576 100755 (executable)
--- a/test/build-server.multi_dist2/buildsvr.init
+++ b/test/build-server.multi_dist2/buildsvr.init
@@ -1,4 +1,7 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 rm -rf buildsvr01
 rm -rf git01
 rm -rf bin
@@ -7,18 +10,18 @@ rm -rf ~/.build_tools/build_server/testserver3
 ../../build-svr remove -n testserver3
 mkdir buildsvr01
 cd buildsvr01
-../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
+${RUBY} ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1
 cd ..
 
-../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
-../../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/pkgsvr01/unstable2 -d 127.0.0.1:3333
-../../build-svr add-os -n testserver3 -o ubuntu-32
-../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
-../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
-../../build-svr add-prj -n testserver3 -N testa -D unstable2 -g `pwd`/git01/a -b master
-../../build-svr add-prj -n testserver3 -N testb -D unstable2 -g `pwd`/git01/b -b master
-../../build-svr add-prj -n testserver3 -N testbin -D unstable -P bin
-../../build-svr add-prj -n testserver3 -N testbin -D unstable2 -P bin
+${RUBY} ../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333
+${RUBY} ../../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/pkgsvr01/unstable2 -d 127.0.0.1:3333
+${RUBY} ../../build-svr add-os -n testserver3 -o ubuntu-32
+${RUBY} ../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testa -D unstable2 -g `pwd`/git01/a -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testb -D unstable2 -g `pwd`/git01/b -b master
+${RUBY} ../../build-svr add-prj -n testserver3 -N testbin -D unstable -P bin
+${RUBY} ../../build-svr add-prj -n testserver3 -N testbin -D unstable2 -P bin
 
 mkdir -p git01
 cp ../git01/*.tar.gz git01/
@@ -32,4 +35,4 @@ cd ..
 mkdir -p bin
 cp ../bin/* bin/
 
-ruby -d ../../build-svr start -n testserver3 -p 2223 --CHILD
+${RUBY}  ../../build-svr start -n testserver3 -p 2223 --CHILD

diff --git a/test/build-server.multi_dist2/pkgsvr.init b/test/build-server.multi_dist2/pkgsvr.init
index 37b4357611370554f8d10d2113a58921ceef55d0..adfa33b4946dd1fbd7eb9b45644f314aff4dce38 100755 (executable)
--- a/test/build-server.multi_dist2/pkgsvr.init
+++ b/test/build-server.multi_dist2/pkgsvr.init
@@ -1,10 +1,13 @@
 #!/bin/sh
+if [ "x${RUBY}" = "x" ] ;then
+    RUBY="ruby -d"
+fi
 rm -rf ~/.build_tools/pkg_server/pkgsvr01
 rm -rf `pwd`/pkgsvr01
-ruby -d ../../pkg-svr create -n pkgsvr01 -d unstable
-ruby -d ../../pkg-svr add-dist -n pkgsvr01 -d unstable2
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o ubuntu-32
-ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o windows-32
-ruby -d ../../pkg-svr start -n pkgsvr01 -p 3333
+${RUBY} ../../pkg-svr create -n pkgsvr01 -d unstable
+${RUBY} ../../pkg-svr add-dist -n pkgsvr01 -d unstable2
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o ubuntu-32
+${RUBY} ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o windows-32
+${RUBY} ../../pkg-svr start -n pkgsvr01 -p 3333