Index: build/build.sh =================================================================== diff -u -r0188856aab5c6f035ee542a380a62631d168ec01 -r22bd0f3da8c3d924e50deb40e641a2891e8150f4 --- build/build.sh (.../build.sh) (revision 0188856aab5c6f035ee542a380a62631d168ec01) +++ build/build.sh (.../build.sh) (revision 22bd0f3da8c3d924e50deb40e641a2891e8150f4) @@ -37,8 +37,8 @@ # Build specs out_path="build" setBuildVariables ${buildSpecs[@]} -REMOTE_DIR=$(getRemoteCopyAddress "DEN_UI") -STATUS_REPORT=$REMOTE_DIR/"StatusReport.csv" +REPORT_DIR=$(getRemoteCopyAddress "DEN_UI") +STATUS_REPORT=$REPORT_DIR/"StatusReport.csv" REPORT=Report # Get the build variables @@ -193,7 +193,7 @@ ./setupscript/projectsetup.sh "ui" cd application echo " ------------------------------ run the cppcheck" -cppCheckStatus=$(runCppcheck $(pwd) $REMOTE_DIR $STATUS_REPORT) +cppCheckStatus=$(runCppcheck $(pwd) $REPORT_DIR $STATUS_REPORT) if [[ $cppCheckStatus -eq 1 ]] then hasTestPassed=false @@ -286,17 +286,17 @@ echo " ------------------------------ copy the out file into the server" LOG=Logs echo " ------------------------------ $poky_out" -mkdir -p $REMOTE_DIR/$REPORT_DIR/$LOG -cp $out_path/* $REMOTE_DIR/$REPORT_DIR/$LOG -mkdir -p $REMOTE_DIR/$REPORT_DIR/bin/$poky_out -cp $out_path/$poky_out/denali $REMOTE_DIR/$REPORT_DIR/bin/$poky_out +mkdir -p $REPORT_DIR/$REPORT_DIR/$LOG +cp $out_path/* $REPORT_DIR/$REPORT_DIR/$LOG +mkdir -p $REPORT_DIR/$REPORT_DIR/bin/$poky_out +cp $out_path/$poky_out/denali $REPORT_DIR/$REPORT_DIR/bin/$poky_out sync;sync;sync; echo " ------------------------------ $gcc_out" -mkdir -p $REMOTE_DIR/$REPORT_DIR/$LOG -cp $out_path/* $REMOTE_DIR/$REPORT_DIR/$LOG -mkdir -p $REMOTE_DIR/$REPORT_DIR/bin/$gcc_out -cp $out_path/$gcc_out/denali $REMOTE_DIR/$REPORT_DIR/bin/$gcc_out +mkdir -p $REPORT_DIR/$REPORT_DIR/$LOG +cp $out_path/* $REPORT_DIR/$REPORT_DIR/$LOG +mkdir -p $REPORT_DIR/$REPORT_DIR/bin/$gcc_out +cp $out_path/$gcc_out/denali $REPORT_DIR/$REPORT_DIR/bin/$gcc_out sync;sync;sync; getManualCases @@ -316,10 +316,10 @@ fi # Generate code review project -getCodeReviewReport "UI" $REMOTE_DIR +getCodeReviewReport "UI" $REPORT_DIR # Mark pass/fail to the build folder -markRemoteFolderWithPassFail $hasTestPassed $REMOTE_DIR +markRemoteFolderWithPassFail $hasTestPassed $REPORT_DIR Index: build/unittest.sh =================================================================== diff -u -rb34d892bc06398226f1461cfdd3b58f65c2118d5 -r22bd0f3da8c3d924e50deb40e641a2891e8150f4 --- build/unittest.sh (.../unittest.sh) (revision b34d892bc06398226f1461cfdd3b58f65c2118d5) +++ build/unittest.sh (.../unittest.sh) (revision 22bd0f3da8c3d924e50deb40e641a2891e8150f4) @@ -81,6 +81,9 @@ LOG_PATH=$REPORT_PATH/$LOG UNITTEST_RESULT=0 + + # Test pass/fail flag + hasTestPassed=true } function setup_System_Environment() { @@ -229,7 +232,8 @@ then echo "Coverage test failed!" echo "Coverage Test, Failed, $percentage%" >> $STATUS_REPORT - exit 1 + hasTestPassed=false + #exit 1 else echo "Coverage test passed!" echo "Coverage Test, Passed, $percentage%" >> $STATUS_REPORT @@ -277,7 +281,8 @@ do echo $test >> $STATUS_REPORT done - exit 1 + hasTestPassed=false + #exit 1 else echo "Unit Test, Passed" >> $STATUS_REPORT fi @@ -352,10 +357,12 @@ mergeCoverages importCoverage reportCoverage - } main copy_TestsResults_IntoServer check_TestResults + +# Mark pass/fail to the build folder +markRemoteFolderWithPassFail $hasTestPassed $REPORT_DIR