X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=d9b5e87dceeb9f02be654753ee9780a4877dda23;hb=refs%2Fchanges%2F48%2F7548%2F2;hp=da2abf5e4aa3ac09758a52bec4cd8e8c353ed424;hpb=4dd321bda70fab4987c1ea7aa0dffc5e1eb74252;p=nonrtric.git diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh index da2abf5e..d9b5e87d 100755 --- a/test/common/testcase_common.sh +++ b/test/common/testcase_common.sh @@ -248,6 +248,7 @@ PRINT_CURRENT_STATS=0 #Var to control if container/pod runtim statistics shall be collected COLLECT_RUNTIME_STATS=0 +COLLECT_RUNTIME_STATS_PID=0 #File to keep deviation messages DEVIATION_FILE=".tmp_deviations" @@ -264,8 +265,13 @@ trap_fnc() { } trap trap_fnc ERR -# Trap to kill subprocesses -trap "kill 0" EXIT +# Trap to kill subprocess for stats collection (if running) +trap_fnc2() { + if [ $COLLECT_RUNTIME_STATS_PID -ne 0 ]; then + kill $COLLECT_RUNTIME_STATS_PID + fi +} +trap trap_fnc2 EXIT # Counter for tests TEST_SEQUENCE_NR=1 @@ -1593,6 +1599,7 @@ setup_testenvironment() { if [ $COLLECT_RUNTIME_STATS -eq 1 ]; then ../common/genstat.sh $RUNMODE $SECONDS $TESTLOGS/$ATC/stat_data.csv $LOG_STAT_ARGS & + COLLECT_RUNTIME_STATS_PID=$! fi }