etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Launch the smoke suite from the basedir - ${base.dir}/test

This commit is contained in:
Prasanna Santhanam 2012-07-07 21:50:00 +05:30
parent bcfd64ab8f
commit 505f27ea84
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-tests.xml
View File

@ -109,7 +109,7 @@
<target name="run-simulator-tests">
<exec dir="test/" executable="bash">
<arg line="setup.sh -t integration/smoke-simulator/ -c integration/smoke-simulator/simulator-smoke.cfg -d localhost -m localhost" />
<arg line="setup.sh -b ${base.dir}/test -t integration/smoke-simulator/ -c integration/smoke-simulator/simulator-smoke.cfg -d localhost -m localhost" />
</exec>
</target>
<!-- -->

7
test/setup.sh
View File

@ -19,7 +19,7 @@ TESTDIR="/root/cloudstack-oss/test/integration/smoke-simulator/"
CONFIG="/root/cloudstack-oss/test/integration/smoke-simulator/simulator-smoke.cfg"
DB_SVR="localhost"
while getopts 't:d:m:c:' OPTION
while getopts 't:d:m:c:b:' OPTION
do
case $OPTION in
d) dflag=1
@ -34,6 +34,9 @@ do
c) cflag=1
CONFIG="$OPTARG"
;;
b) bflag=1
BASEDIR="$OPTARG"
;;
?) usage
failed 2
;;
@ -64,7 +67,7 @@ then
sleep 60
python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -f $TESTDIR/testSetupSuccess.py -l
cat /tmp/r.log
python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -d $TESTDIR -l
python -m marvin.deployAndRun -c $CONFIG -t /tmp/t.log -r /tmp/r.log -d $TESTDIR -l -n
echo "Done"
else
echo "Python version 2.7 not detected on system. Aborting"