Index: build/unittest.sh =================================================================== diff -u -rb65bbda18443c1798e5c602439a791a2e85b8b5b -rf94a9de27ce5f6c8bd7a13f95f0ca411ba2b5bd2 --- build/unittest.sh (.../unittest.sh) (revision b65bbda18443c1798e5c602439a791a2e85b8b5b) +++ build/unittest.sh (.../unittest.sh) (revision f94a9de27ce5f6c8bd7a13f95f0ca411ba2b5bd2) @@ -12,10 +12,13 @@ SQUISH_DIR="/opt/SquishforQt/squish-for-qt-6.5.1" REMOTE_DIR="/media/XDrive/Users/Bamboo-Projects" REPORT_DIR="$timeStamp-BuildNo-$buildNumber-$buildPlan" +REPORT=Report export PATH=$PATH:/opt/SquishCoco/bin:/opt/SquishCoco/wrapper/bin export DISPLAY=:10.0 +mkdir $REPORT + # --------------------------- clone denali git clone ssh://git@dvm-linux02:7999/ui/application.git @@ -35,7 +38,7 @@ # --------------------------- Start Squish server echo "Starting squishserver on port=$SQUISH_SERVER_PORT..." -$SQUISH_DIR/bin/squishserver --port $SQUISH_SERVER_PORT 1>Report/server.log 2>Report/server.err & +$SQUISH_DIR/bin/squishserver --port $SQUISH_SERVER_PORT 1>$REPORT/server.log 2>$REPORT/server.err & sleep 5 # --------------------------- Register the AUT @@ -44,7 +47,7 @@ # --------------------------- Run the Squish runner echo "Starting tests..." -$SQUISH_DIR/bin/squishrunner --port $SQUISH_SERVER_PORT --testsuite testsuites --exitCodeOnFail 13 --reportgen html,Report/UnitTest +$SQUISH_DIR/bin/squishrunner --port $SQUISH_SERVER_PORT --testsuite testsuites --exitCodeOnFail 13 --reportgen html,$REPORT/UnitTest # --------------------------- Stop Squish server echo "Stopping squishserver..." @@ -62,7 +65,7 @@ # --------------------------- Importing the excecution report into the coverage database cmcsexeimport -m $PWD/$BUID_DIR/denali.csmes -t UnitTest01 $PWD/$BUID_DIR/denali.csexe # --------------------------- Generating the coverage report -cmreport --csmes=$PWD/$BUID_DIR/denali.csmes --html=Report/Coverage/index +cmreport --csmes=$PWD/$BUID_DIR/denali.csmes --html=$REPORT/Coverage/index # --------------------------- Copy the reports mkdir $REMOTE_DIR/$REPORT_DIR