Index: build/build.sh =================================================================== diff -u -r34aeccdd129afdcb860560ead152aed5901bd363 -r45d909809dda121132506d0ceb8f7cd67d168ac6 --- build/build.sh (.../build.sh) (revision 34aeccdd129afdcb860560ead152aed5901bd363) +++ build/build.sh (.../build.sh) (revision 45d909809dda121132506d0ceb8f7cd67d168ac6) @@ -53,8 +53,8 @@ setBuildVariables ${buildSpecs[@]} # Retrieve the status report -REMOTE_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) -fileName=$(find $REMOTE_DIR -maxdepth 1 -name \*"Build_Report"\*.csv) +REMOTE_DIR=$(getRemoteCopyAddress "DEN_UI" "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}") +fileName=$(find "$REMOTE_DIR" -maxdepth 1 -name \*"Build_Report"\*.csv) STATUS_REPORT=$fileName # Get the build variables @@ -179,14 +179,14 @@ # i.e void test(QString &a, bool b) -> void test(QString &a - bool b) manualCase=$(echo $manualCase | sed "s/,/ -/") # Write the values to the statu report - echo $file, $line, $manualCase >> $STATUS_REPORT + echo $file, $line, $manualCase >> "$STATUS_REPORT" # Set the current line as the previous line and get ready for the next check previousLine=$line done done - echo "", "", "" >> $STATUS_REPORT - cd $currentDir + echo "", "", "" >> "$STATUS_REPORT" + cd "$currentDir" rm -rf $manualCasesFolder } @@ -210,7 +210,7 @@ ./setupscript/projectsetup.sh "${buildSpecs[$PROJECT_NAME_INDEX]}" "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" \ "${buildSpecs[$COMMON_CHECKOUT_INDEX]}" cd application -cppCheckStatus=$(runCppcheck $(pwd) $REMOTE_DIR $STATUS_REPORT) +cppCheckStatus=$(runCppcheck "$(pwd)" "$REMOTE_DIR" "$STATUS_REPORT") if [[ $cppCheckStatus -eq 1 ]] then hasTestPassed=false @@ -299,7 +299,7 @@ if [[ $(grep "warning:" $build_err) != "" ]] then echo "WARNING: Application Build Has Warnings [$gcc_out]" - echo "Application build warnings:, $gcc_out" >> $STATUS_REPORT + echo "Application build warnings:, $gcc_out" >> "$STATUS_REPORT" fi cd .. @@ -309,7 +309,7 @@ cd $poky_out echo " ------------------------------ run qmake" - $poky_qmake ../../$pro_path/$pro_name $poky_spec $pro_build + $poky_qmake ../../$pro_path/$pro_name "$poky_spec" "$pro_build" echo " ------------------------------ run make" build_err=../build_$poky_out.err @@ -319,20 +319,20 @@ if [[ $(grep "error:" $build_err) != "" ]] then echo "ERROR: Application Build Failed [$poky_out]" - echo "Build Poky v9.3.0, Failed, $poky_out" >> $STATUS_REPORT + echo "Build Poky v9.3.0, Failed, $poky_out" >> "$STATUS_REPORT" hasTestPassed=false else - echo "Build Poky v9.3.0, Passed" >> $STATUS_REPORT + echo "Build Poky v9.3.0, Passed" >> "$STATUS_REPORT" # Add the shasum256 sha256sum -b --tag denali >> denali fi if [[ $(grep "warning:" $build_err) != "" ]] then echo "WARNING: Application Build Has Warnings [$poky_out]" - echo "Application build warnings:, $poky_out" >> $STATUS_REPORT + echo "Application build warnings:, $poky_out" >> "$STATUS_REPORT" fi - echo "" >> $STATUS_REPORT + echo "" >> "$STATUS_REPORT" # ============================================================= #echo " ------------------------------ stop denali on device [$DEVICE_IP]" Index: build/unittest.sh =================================================================== diff -u -r34aeccdd129afdcb860560ead152aed5901bd363 -r45d909809dda121132506d0ceb8f7cd67d168ac6 --- build/unittest.sh (.../unittest.sh) (revision 34aeccdd129afdcb860560ead152aed5901bd363) +++ build/unittest.sh (.../unittest.sh) (revision 45d909809dda121132506d0ceb8f7cd67d168ac6) @@ -22,7 +22,7 @@ { if [[ ! -d "supportscript" ]] then - git clone ssh://git@192.168.10.132:7999/bl/supportscript.git + git clone "$REMOTE_REPO_BASE_ADDRESS"supportscript.git fi source ./supportscript/supportscript.sh } @@ -82,11 +82,11 @@ local isBuildLocal=false - setBuildVariables ${buildSpecs[@]} - REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]}) - STATUS_REPORT=$(createStatusReport "application" $REPORT_DIR $isBuildLocal) - getCommitHashes $STATUS_REPORT ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ - ${buildSpecs[$COMMON_CHECKOUT_INDEX]} "" ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + setBuildVariables "${buildSpecs[@]}" + REPORT_DIR=$(getRemoteCopyAddress "DEN_UI" "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}") + STATUS_REPORT=$(createStatusReport "application" "$REPORT_DIR" $isBuildLocal) + 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 @@ -129,8 +129,8 @@ echo " ------------------------------ Clone Denali " if [ -z "$RUN_FOR_LOCAL" ]; then git clone "$REMOTE_REPO_BASE_ADDRESS"setupscript.git - ./setupscript/projectsetup.sh ${buildSpecs[$PROJECT_NAME_INDEX]} ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} \ - ${buildSpecs[$COMMON_CHECKOUT_INDEX]} + ./setupscript/projectsetup.sh "${buildSpecs[$PROJECT_NAME_INDEX]}" "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" \ + "${buildSpecs[$COMMON_CHECKOUT_INDEX]}" else cp -r $LOCAL_PROJECT_DIR/application application cp -r $LOCAL_PROJECT_DIR/common common @@ -145,7 +145,7 @@ if [[ ! -z ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} ]] then cd testsuites - git checkout ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + git checkout "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" cd $currentDir fi @@ -158,10 +158,10 @@ rm -rf venv virtualenv --python=python3.6 venv source venv/bin/activate - pip3 install git+ssh://git@192.168.10.132:7999/vv/dialin.git@${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + pip3 install git@bitbucket.org:diality-cloud/dialin.git@"${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" else cd testsuites/tools - ./setup_env.sh ${buildSpecs[$PROJECT_CHECKOUT_INDEX]} + ./setup_env.sh "${buildSpecs[$PROJECT_CHECKOUT_INDEX]}" fi # Updated paths.ini @@ -170,7 +170,7 @@ #sudo python3 update_paths.py --squishqt $SQUISH_DIR else - cp -r $LOCAL_PROJECT_DIR/testsuites testsuites + cp -r "$LOCAL_PROJECT_DIR"/testsuites testsuites fi }