Index: build/unittest.sh =================================================================== diff -u -r6da217788fc7b4c08b355217f7d5d8776a376e0f -r1f26cdb21531ae29dc5983533b6d2abf08ed62ff --- build/unittest.sh (.../unittest.sh) (revision 6da217788fc7b4c08b355217f7d5d8776a376e0f) +++ build/unittest.sh (.../unittest.sh) (revision 1f26cdb21531ae29dc5983533b6d2abf08ed62ff) @@ -1,7 +1,8 @@ #!/bin/bash +# Local example $./run.unittest.sh :0 5.12.5 /media/sf_VMSHARE + echo " ------------------------------ Definisions " -# $./run.unittest.sh :0 5.12.5 /media/sf_VMSHARE #Setting up Display number if [[ "$1" = "" ]]; then DISPLAY_NO=:10.0 @@ -41,7 +42,11 @@ mkdir -p $REPORT/$LOG echo " ------------------------------ Clone Denali " -git clone ssh://git@dvm-linux02:7999/ui/application.git +if [[ "$RUN_FOR_LOCAL" = "" ]]; then + git clone ssh://git@dvm-linux02:7999/ui/application.git +else + cp -r ../../Project/application application +fi echo " ------------------------------ Build Application " mkdir $BUID_DIR @@ -54,17 +59,21 @@ cd .. echo " ------------------------------ Clone the Test Suites" -git clone ssh://git@dvm-linux02:7999/ui/testsuites.git +if [[ "$RUN_FOR_LOCAL" = "" ]]; then + git clone ssh://git@dvm-linux02:7999/ui/testsuites.git +else + cp -r ../../Project/testsuites testsuites +fi echo " ------------------------------ Starting the Squish Server" -$SQUISH_DIR/bin/squishserver addAUT $BUID_DIR/denali --port=$SQUISH_SERVER_PORT 1>$REPORT/$LOG/squishqtserver.log 2>$REPORT/$LOG/squishqtserver.err & +$SQUISH_DIR/bin/squishserver addAUT $(pwd)/$BUID_DIR/denali --port=$SQUISH_SERVER_PORT 1>$REPORT/$LOG/squishqtserver.log 2>$REPORT/$LOG/squishqtserver.err & echo " ------------------------------ Starting tests" $SQUISH_DIR/bin/squishrunner --testsuite testsuites --exitCodeOnFail 13 --reportgen html,$REPORT/UnitTest 1>$REPORT/$LOG/squishqtrunner.log 2>$REPORT/$LOG/squishqtrunner.err UNITTEST_RESULT=$? echo " ------------------------------ Importing the excecution report into the coverage database" -cmcsexeimport -m $BUID_DIR/denali.csmes -t UnitTest01 $BUID_DIR/denali.csexe 1>$REPORT/$LOG/cmcsexeimport.log 2>$REPORT/$LOG/cmcsexeimport.err +cmcsexeimport -p merge -m $BUID_DIR/denali.csmes -t UnitTest01 $BUID_DIR/denali.csexe 1>$REPORT/$LOG/cmcsexeimport.log 2>$REPORT/$LOG/cmcsexeimport.err echo " ------------------------------ Generating the coverage report" cmreport --csmes=$BUID_DIR/denali.csmes --html=$REPORT/Coverage/index 1>$REPORT/$LOG/cmreport.log 2>$REPORT/$LOG/cmreport.err