From 72e031bf9948aad66038f354285ab38505ba4928 Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Thu, 24 Oct 2024 21:06:45 +0300 Subject: [PATCH] Update submodule and enable ASAN_OPTIONS=detect_leaks=1 --- buildScripts/github/run_tests.sh | 2 +- buildScripts/github/test.sh | 2 +- plugins/robots/thirdparty/trikRuntime/trikRuntime | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildScripts/github/run_tests.sh b/buildScripts/github/run_tests.sh index 35a842dbf9..957fb52af6 100755 --- a/buildScripts/github/run_tests.sh +++ b/buildScripts/github/run_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash export QT_QPA_PLATFORM=minimal -export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=0:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0:detect_odr_violation=0 # dirty hack for libtrikQsLog and libtrikRuntimeQsLog +export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=1:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0:detect_odr_violation=0 # dirty hack for libtrikQsLog and libtrikRuntimeQsLog export LSAN_OPTIONS=suppressions=$PWD/bin/lsan.supp:print_suppressions=0 export DISPLAY=:0 export TRIK_PYTHONPATH=${TRIK_PYTHONPATH:-$(python3.${TRIK_PYTHON3_VERSION_MINOR} -c 'import sys; import os; print(os.pathsep.join(sys.path))')} diff --git a/buildScripts/github/test.sh b/buildScripts/github/test.sh index 40955fd2e3..b53380d3f4 100755 --- a/buildScripts/github/test.sh +++ b/buildScripts/github/test.sh @@ -3,7 +3,7 @@ set -euo pipefail [ -r tests_qrs.7z ] || curl -Lo tests_qrs.7z https://dl.trikset.com/edu/.solutions20200701/testing_small.7z which 7z &> /dev/null && 7z -y x tests_qrs.7z || 7za x tests_qrs.7z -export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=0:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0:detect_odr_violation=0 # dirty hack for libtrikQsLog and libtrikRuntimeQsLog +export ASAN_OPTIONS=$(if [[ $RUNNER_OS == Linux ]]; then echo 'detect_leaks=1:'; else echo -n ''; fi)detect_stack_use_after_return=1:fast_unwind_on_malloc=0:detect_odr_violation=0 # dirty hack for libtrikQsLog and libtrikRuntimeQsLog env ASAN_OPTIONS=${ASAN_OPTIONS} \ LSAN_OPTIONS=${LSAN_OPTIONS:-suppressions=$PWD/bin/lsan.supp:print_suppressions=0} \ QT_QPA_PLATFORM=${QT_QPA_PLATFORM:-minimal} \ diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime index 8639e294a7..4bf5d4764e 160000 --- a/plugins/robots/thirdparty/trikRuntime/trikRuntime +++ b/plugins/robots/thirdparty/trikRuntime/trikRuntime @@ -1 +1 @@ -Subproject commit 8639e294a71f29c8c918765aba610cd781112466 +Subproject commit 4bf5d4764eccb931aca3ed95750b66a0afea3f5c