Index: .gitignore =================================================================== diff -u --- .gitignore (revision 0) +++ .gitignore (revision b56991abe47642969fbebe4f5df3b2f6ef53512c) @@ -0,0 +1 @@ +*~ Index: local/run.coco.sh =================================================================== diff -u -r1131b3828aa1f23edabbd11105a4d8b6ddde9dca -rb56991abe47642969fbebe4f5df3b2f6ef53512c --- local/run.coco.sh (.../run.coco.sh) (revision 1131b3828aa1f23edabbd11105a4d8b6ddde9dca) +++ local/run.coco.sh (.../run.coco.sh) (revision b56991abe47642969fbebe4f5df3b2f6ef53512c) @@ -2,18 +2,28 @@ # cmcsexeimport --csmes coco/tst_models/tst_models.csmes --title tst_models --csexe coco/tst_models/tst_models.csexe 2>coco/log/tst_models_cmcsexeimport.err | tee coco/tst_models/tst_models_cmcsexeimport.log # cmreport --csmes=tst_models/tst_models.csmes --html=Report/index 2>coco/log/tst_models_cmreport.err | tee coco/tst_models/tst_models_cmreport.log + +# SINGLE CASE EXEUTION WITH REPORT +# └ β /opt/squish-for-qt-7.1-20230505-1514/bin/squishserver --config addAUT denaliSquish /home/denali/coco/build/denaliSquish/ +# └ β /opt/squish-for-qt-7.1-20230505-1514/bin/squishserver & +# └ β /opt/squish-for-qt-7.1-20230505-1514/bin/squishrunner --testsuite /home/denali/Projects/testsuites --testcase tst_service_screen --reportgen html,/home/denali/coco/report/squish + + + ERR_TESTSUITE=10000 ERR_COCO_SERVER_CONNECTION=1001 ERR_CANBUS_SETUP=1002 +JOBS=4 + COCO_SERVER=192.168.10.41 QT_VER=5.15.10 QT_PATH="/opt/Qt$QT_VER/$QT_VER/gcc_64/bin" QT_TESTS_LIST_FILE=tst_names.lst QT_TESTS_LIST_PATH=$HOME/Projects/scripts/local/ -APPLICATION_DIR=application +APPLICATION_DIR=unittests TESTSUITE_DIR=testsuites WORKING_DIR=coco @@ -23,6 +33,8 @@ REPORT_DIR=report DENALI_SQUISH=denaliSquish +USB_DRIVE_PATH=$HOME/Desktop/usb-disk/ +SD_CARD_PATH=$HOME/Desktop/sd-card/ PROJECT_PATH=$HOME/Projects WORKING_PATH=$HOME/coco @@ -150,8 +162,8 @@ server_squish_run server_squish_stop else - $BUILD_PATH/$test/$test \ - 2> $LOG_PATH/$test.err \ + $BUILD_PATH/$test/$test \ + 2> $LOG_PATH/$test.err \ | tee $REPORT_QTTEST/$test.report fi popd @@ -164,20 +176,23 @@ echo $(pwd) $QT_PATH/qmake \ - $APPLICATION_PATH/denali.pro \ + $APPLICATION_PATH/denali.pro \ -spec linux-g++ \ CONFIG+="$1" \ CONFIG+=CodeCoverage \ TARGET="$BUILD_PATH/$1/$1" echo "Run make" - /usr/bin/make \ - LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j4 \ - 2> "$LOG_PATH/build_$1".err \ + echo "" > "$LOG_PATH/build_$1".err + tail -f "$LOG_PATH/build_$1".err & + /usr/bin/make \ + LINK=csg++ AR=csar CXX=csg++ CC=csgcc -j$JOBS \ + 2>> "$LOG_PATH/build_$1".err \ | tee "$LOG_PATH/build_$1".log /usr/bin/make clean rm *.csmes echo " ------------------------------ Cleaned for next build" + killall tail # better to get the process id to avoid killing user tail processes. } @@ -237,19 +252,30 @@ ##### ---------- MAIN ------------------------------------------------------------------------------------------------- if [ "$1" == "--build" ]; then server_coco_check - cleanup_directories + if [[ "$2" == "" ]]; then + cleanup_directories + fi cd $WORKING_PATH tests_copy_list tests_read_list generate_alarm_mapping - for test in ${QT_TESTS_LIST[@]};do - coverage_build $test - done + if [[ "$2" == "" ]]; then + for test in ${QT_TESTS_LIST[@]};do + echo "coverage build for the test $test" + coverage_build $test + done + else + echo "coverage build for the test $test" + coverage_build "$2" + fi fi if [ "$1" == "--run" ]; then cd $WORKING_PATH + # tst_service screen needs the folders to be empty. + rm -frd $USB_DRIVE_PATH + rm -frd $SD_CARD_PATH tests_read_list tests_run fi Index: local/tst_names.lst =================================================================== diff -u -rc28bb75d80a72b195cbe5625ff302aab40f04aeb -rb56991abe47642969fbebe4f5df3b2f6ef53512c --- local/tst_names.lst (.../tst_names.lst) (revision c28bb75d80a72b195cbe5625ff302aab40f04aeb) +++ local/tst_names.lst (.../tst_names.lst) (revision b56991abe47642969fbebe4f5df3b2f6ef53512c) @@ -1,10 +1,8 @@ denaliSquish -tst_logging tst_initializations -tst_canbus +tst_threads tst_utilities +tst_canbus tst_acknow tst_messaging tst_models -tst_views -tst_threads