Index: local/run.coco.sh =================================================================== diff -u -rc28bb75d80a72b195cbe5625ff302aab40f04aeb -r4e3988b004dcb061bb617b3de26dcfc8a4be8bed --- local/run.coco.sh (.../run.coco.sh) (revision c28bb75d80a72b195cbe5625ff302aab40f04aeb) +++ local/run.coco.sh (.../run.coco.sh) (revision 4e3988b004dcb061bb617b3de26dcfc8a4be8bed) @@ -7,7 +7,7 @@ ERR_CANBUS_SETUP=1002 COCO_SERVER=192.168.10.41 -QT_VER=5.12.5 +QT_VER=5.15.10 QT_PATH="/opt/Qt$QT_VER/$QT_VER/gcc_64/bin" QT_TESTS_LIST_FILE=tst_names.lst @@ -24,7 +24,7 @@ DENALI_SQUISH=denaliSquish -PROJECT_PATH=$HOME/Projects/ +PROJECT_PATH=$HOME/Projects WORKING_PATH=$HOME/coco REPORT_PATH=$WORKING_PATH/$REPORT_DIR LOG_PATH=$WORKING_PATH/$LOG_DIR @@ -36,8 +36,8 @@ VCAN_SCRIPT=$PROJECT_PATH/scripts/setupCAN/setupVCAN.sh -SQUISH_SERVER=/opt/squishqt/bin/squishserver -SQUISH_RUNNER=/opt/squishqt/bin/squishrunner +SQUISH_SERVER=/opt/squish-for-qt-7.1-20230505-1514/bin/squishserver +SQUISH_RUNNER=/opt/squish-for-qt-7.1-20230505-1514/bin/squishrunner REPORT_COCO=$REPORT_PATH/coco REPORT_SQUISH=$REPORT_PATH/squish @@ -80,16 +80,14 @@ function server_squish_run() { - echo " ------------------------------ Starting tests" - $SQUISH_RUNNER \ - --testsuite $TESTSUITE_PATH \ - --exitCodeOnFail $ERR_TESTSUITE \ + echo " ------------------------------ Starting tests $TESTSUITE_PATH" + $SQUISH_RUNNER \ + --testsuite $TESTSUITE_PATH \ --reportgen html,$REPORT_SQUISH \ 2> $LOG_PATH/squishqtrunner.err \ - | tee $LOG_PATH/squishqtrunner.log + | tee $LOG_PATH/squishqtrunner.log } - function server_squish_stop() { echo " ------------------------------ Stopping the Squish Server" $SQUISH_SERVER --stop Index: local/run.squish.path.ini.mod.sh =================================================================== diff -u -radacb0fc57fd0e03eaf98600feae4c8e55b9dcec -r4e3988b004dcb061bb617b3de26dcfc8a4be8bed --- local/run.squish.path.ini.mod.sh (.../run.squish.path.ini.mod.sh) (revision adacb0fc57fd0e03eaf98600feae4c8e55b9dcec) +++ local/run.squish.path.ini.mod.sh (.../run.squish.path.ini.mod.sh) (revision 4e3988b004dcb061bb617b3de26dcfc8a4be8bed) @@ -8,15 +8,15 @@ PATHS_INI=\ "# Updated manually to set the python interpreter of the /usr \n"\ "[Interpreter]\n"\ -"PythonPluginVersion = \"3.6\"\n"\ +"PythonPluginVersion = \"3.8\"\n"\ "[Paths]\n"\ -"LibraryPath = \"@(SQUISH_PREFIX)/lib:@(SQUISH_PREFIX)/perl/lib/perl5/5.22.0/x86_64-linux/CORE:/usr:@(SQUISH_PREFIX)/ruby/lib:@(SQUISH_PREFIX)/tcl/lib\"\n"\ -"Scripting/PerlLib = \"@(SQUISH_PREFIX)/lib/perl:/opt/rh/devtoolset-7/root//usr/lib64/perl5/vendor_perl:/opt/rh/devtoolset-7/root/usr/lib/perl5:/opt/rh/devtoolset-7/root//usr/share/perl5/vendor_perl:@(SQUISH_PREFIX)/perl/lib/perl5/site_perl/5.22.0/x86_64-linux:@(SQUISH_PREFIX)/perl/lib/perl5/site_perl/5.22.0:@(SQUISH_PREFIX)/perl/lib/perl5/5.22.0/x86_64-linux:@(SQUISH_PREFIX)/perl/lib/perl5/5.22.0:.\"\n"\ +"LibraryPath = \"@(SQUISH_PREFIX)/lib:@(SQUISH_PREFIX)/perl/lib/perl5/5.34.0/x86_64-linux/CORE:/usr:@(SQUISH_PREFIX)/ruby/lib:@(SQUISH_PREFIX)/tcl/lib:/home/autotest/binPackage/x64/ffmpeg/4.4/lib\"\n"\ +"Scripting/PerlLib = \"@(SQUISH_PREFIX)/lib/perl:@(SQUISH_PREFIX)/perl/lib/perl5/site_perl/5.34.0/x86_64-linux:@(SQUISH_PREFIX)/perl/lib/perl5/site_perl/5.34.0:@(SQUISH_PREFIX)/perl/lib/perl5/5.34.0/x86_64-linux:@(SQUISH_PREFIX)/perl/lib/perl5/5.34.0\"\n"\ "Scripting/PythonHome = \"/usr\"\n"\ "Scripting/RubyLib = \"@(SQUISH_PREFIX)/ruby/lib/ruby/gems/2.5.0/gems/did_you_mean-1.2.0/lib;@(SQUISH_PREFIX)/ruby/lib/ruby/site_ruby/2.5.0;@(SQUISH_PREFIX)/ruby/lib/ruby/site_ruby/2.5.0/x86_64-linux;@(SQUISH_PREFIX)/ruby/lib/ruby/site_ruby;@(SQUISH_PREFIX)/ruby/lib/ruby/vendor_ruby/2.5.0;@(SQUISH_PREFIX)/ruby/lib/ruby/vendor_ruby/2.5.0/x86_64-linux;@(SQUISH_PREFIX)/ruby/lib/ruby/vendor_ruby;@(SQUISH_PREFIX)/ruby/lib/ruby/2.5.0;@(SQUISH_PREFIX)/ruby/lib/ruby/2.5.0/x86_64-linux\"\n"\ "Scripting/TclLibrary = \"@(SQUISH_PREFIX)/tcl/lib/tcl8.6\"\n" -echo -e "$PATHS_INI" > /opt/squishqt/etc/paths.ini +echo -e "$PATHS_INI" > /opt/squish-for-qt-7.1-20230505-1514/etc/paths.ini echo -e "$SERVER_INI" > $HOME/.squish/ver1/server.ini apt purge python2.7-minimal