Index: build/build.sh =================================================================== diff -u -r3fbdcc0ae3fc3ea86238b093439e3d4d7fa3c2a6 -r03f1b552a68d0b7e88eb0d110773c092cbdedb0c --- build/build.sh (.../build.sh) (revision 3fbdcc0ae3fc3ea86238b093439e3d4d7fa3c2a6) +++ build/build.sh (.../build.sh) (revision 03f1b552a68d0b7e88eb0d110773c092cbdedb0c) @@ -38,6 +38,7 @@ PROJECT_NAME_INDEX=0 PROJECT_CHECKOUT_INDEX=8 COMMON_CHECKOUT_INDEX=9 +DEVELOP_BRANCH_NAME="develop" out_path="build" setBuildVariables ${buildSpecs[@]} REMOTE_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) @@ -197,14 +198,12 @@ ./setupscript/projectsetup.sh ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ ${buildSpecs[$COMMON_CHECKOUT_INDEX]} cd application -#echo " ------------------------------ run the cppcheck" #TODO remove cppCheckStatus=$(runCppcheck $(pwd) $REMOTE_DIR $STATUS_REPORT) if [[ $cppCheckStatus -eq 1 ]] then hasTestPassed=false fi -#./cppcheck.sh ../$out_path/ #TODO remove cd .. # Open up the status report and parse for the word Faild. This is @@ -218,7 +217,9 @@ hasTestPassed=false fi -if [[ $hasTestPassed == true ]] +# If test has passed or if develop branch is being built, compile. The develop branch does not have to +# necessarily pass all the tests to be compiled +if [[ $hasTestPassed == true ]] || [[ ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} == $DEVELOP_BRANCH_NAME ]] then echo " ------------------------------ set the build type (debug/release)" buildType "$1" @@ -318,6 +319,7 @@ sync;sync;sync; fi +# To report what cases have been tested manually getManualCases # Generate code reviews