Index: build/unittest.sh =================================================================== diff -u -r9829977229aed11460f69e0463350ddeabb9227c -r59fc83a1a8e287968a3fab7c44a615b2e7faebd6 --- build/unittest.sh (.../unittest.sh) (revision 9829977229aed11460f69e0463350ddeabb9227c) +++ build/unittest.sh (.../unittest.sh) (revision 59fc83a1a8e287968a3fab7c44a615b2e7faebd6) @@ -82,22 +82,22 @@ local isBuildLocal=false setBuildVariables ${buildSpecs[@]} - REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) - reportDir=$REPORT_DIR - STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR $isBuildLocal) - # Call this function to check if the repository has to be tagged or not - tagUIRepository - getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ - ${buildSpecs[$COMMON_CHECKOUT_INDEX]} "" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} - BUID_DIR=build - BUILD_PATH=$WORKING_DIR/$BUID_DIR + REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) + reportDir=$REPORT_DIR + STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR $isBuildLocal) + # Call this function to check if the repository has to be tagged or not + tagUIRepository + getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ + ${buildSpecs[$COMMON_CHECKOUT_INDEX]} "" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + BUILD_DIR=build + BUILD_PATH=$WORKING_DIR/$BUILD_DIR - REPORT=Report - LOG=Logs - REPORT_PATH=$WORKING_DIR/$REPORT - LOG_PATH=$REPORT_PATH/$LOG + REPORT=Report + LOG=Logs + REPORT_PATH=$WORKING_DIR/$REPORT + LOG_PATH=$REPORT_PATH/$LOG - UNITTEST_RESULT=0 + UNITTEST_RESULT=0 } function setup_System_Environment() { @@ -246,7 +246,7 @@ $SQUISH_DIR/bin/squishserver \ --config addAUT $DENALI_SQUISH \ - $WORKING_DIR/$BUID_DIR/ \ + $WORKING_DIR/$BUILD_DIR/ \ 2> $LOG_PATH/squishqtserver.err \ | tee $LOG_PATH/squishqtserver.log @@ -399,7 +399,7 @@ csmes+=$BUILD_PATH/$test.csmes" " done - cmmerge -o $BUID_DIR/denali.csmes \ + cmmerge -o $BUILD_DIR/denali.csmes \ $BUILD_PATH/$DENALI_SQUISH.csmes\ $csmes \ 2> $LOG_PATH/cmmerge.err \ @@ -450,7 +450,7 @@ clone_Repositories make_Directories getAlarmMapping - updateBuildHistoryReport ../application $reportDir + #updateBuildHistoryReport ../application $reportDir if [[ ${buildSpecs[$BUILD_ONLY_FLAG_INDEX]} == false ]] then