Index: build/unittest.sh =================================================================== diff -u -r518ac0bd444954829f8434f644a3d86fdb2c28a4 -r931b3bf105865cee9124e905c414e7ccb42b7f5f --- build/unittest.sh (.../unittest.sh) (revision 518ac0bd444954829f8434f644a3d86fdb2c28a4) +++ build/unittest.sh (.../unittest.sh) (revision 931b3bf105865cee9124e905c414e7ccb42b7f5f) @@ -39,7 +39,6 @@ # --- setup local or server Environment DISPLAY_NO=:10.0 QT_VER="" - #SERVER_DIR="/media/BambooProjects" DENALI_SQUISH=denaliSquish @@ -69,13 +68,8 @@ SQUISH_DIR="/opt/squishqt" COCO_DIR="/opt/SquishCoco" - #REMOTE_DIR="$SERVER_DIR/DEN_UI" - buildType=DVT - #REPORT_DIR="$timeStamp-BuildNo-$buildNumber-$buildPlan" setBuildVariables $buildType $buildNumber REPORT_DIR=$(getRemoteCopyAddress $timeStamp "DEN_UI") - echo $REPORT_DIR - BUID_DIR=build BUILD_PATH=$WORKING_DIR/$BUID_DIR @@ -113,7 +107,9 @@ echo " ------------------------------ Clone Denali " if [ -z "$RUN_FOR_LOCAL" ]; then - git clone ssh://git@dvm-linux02:7999/ui/application.git application + #git clone ssh://git@dvm-linux02:7999/ui/application.git application + git clone ssh://git@dvm-linux02:7999/bl/setupscript.git + ./setupscript/projectsetup.sh "ui" else cp -r $LOCAL_PROJECT_DIR/application application fi @@ -212,7 +208,6 @@ function check_TestResults() { targetedCoverage=100 - #cd $REMOTE_DIR"/"$REPORT_DIR cd $REPORT_DIR cd Coverage/index_html @@ -221,7 +216,7 @@ # Parse everything that is from .*prg0 to the tag # In the parsed section, get everything from .*prg2"> to % and convert it to float values (i.e 42.76) percentage=$(cat index.html | awk '/\yCoverage\y/' | sed -e 's/.*prg0//' -e 's/<\/PRE>.*//' | \ - sed -e 's/.*prg2">//' -e 's/%.*//' | grep -o -E '[0-9]+([.][0-9]+)') + sed -e 's/.*prg2">//' -e 's/%.*//' | grep -o -E '[0-9]') echo "Code Coverage is $coveragePercent%" # Check if the coverage percentage is less than 100% @@ -230,8 +225,6 @@ echo "Coverage test failed" exit 1 fi - - #cd $REMOTE_DIR"/"$REPORT_DIR cd $REPORT_DIR cd UnitTest @@ -253,13 +246,6 @@ exit 1 fi done - - - #if [ -z "$StopOnUnitTestError" ]; then - # exit $UNITTEST_RESULT - #else - # exit 0 - #fi } function copy_TestsResults() { cp $LOG_PATH/QtTest*.log $REPORT_PATH/UnitTest/ @@ -313,8 +299,6 @@ function copy_TestsResults_IntoServer() { echo " ------------------------------ Copy the reports to server" - #mkdir -p $REMOTE_DIR/$REPORT_DIR - #cp -rd $REPORT_PATH/* $REMOTE_DIR/$REPORT_DIR cp -rd $REPORT_PATH/* $REPORT_DIR sync;sync;sync; }