From c9bf4d14bd6be154a9572775007ef417c22689f9 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Sun, 30 Aug 2020 22:53:52 +0200 Subject: [PATCH] run_lte: fix check for apps being shutdown correctly since the new logging system doesn't tag the log file after closing we now use the stdout to verify the UE has been shut down correctly. --- test/run_lte.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/run_lte.sh b/test/run_lte.sh index 0aaa08120..2a84abed2 100755 --- a/test/run_lte.sh +++ b/test/run_lte.sh @@ -96,13 +96,13 @@ check_ping() check_ue() { - # check that all log files have "Closing log" as last line - last_line=$(cat ./${nof_prb}prb_ue.log | tail -n1) - if [ "$last_line" != "Closing log" ]; then + # check that app exited correctly + last_line=$(cat ./${nof_prb}prb_screenlog_srsue.log | tail -n1) + if [[ "$last_line" != *"--- exiting ---"* ]]; then echo "Error. srsUE didn't seem to have exited properly." exit 1 fi - + # Check UE logs don't contain Error from any layer num_error=$(cat ./${nof_prb}prb_ue.log | grep "\[E\]" | wc -l) if [ "$num_error" != "0" ] 2>/dev/null; then @@ -162,9 +162,9 @@ check_ue() check_enb() { - # check that all log files have "Closing log" as last line - last_line=$(cat ./${nof_prb}prb_enb.log | tail -n1) - if [ "$last_line" != "Closing log" ]; then + # check that app exited correctly + last_line=$(cat ./${nof_prb}prb_screenlog_srsenb.log | tail -n1) + if [[ "$last_line" != *"--- exiting ---"* ]]; then echo "Error. srsENB didn't seem to have exited properly." exit 1 fi @@ -214,9 +214,9 @@ check_enb() check_epc() { - # check that log has "Closing log" as last line - last_line=$(cat ./${nof_prb}prb_epc.log | tail -n1) - if [ "$last_line" != "Closing log" ]; then + # check that app exited correctly + last_line=$(cat ./${nof_prb}prb_screenlog_srsepc.log | tail -n1) + if [[ "$last_line" != *"--- exiting ---"* ]]; then echo "Error. srsEPC didn't seem to have exited properly." exit 1 fi