From c31f270c6c306fa10f34791f509d8737ac734e11 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Tue, 27 Apr 2021 16:45:08 -0700
Subject: [PATCH 1/2] check-sof-logger: relax TIMESTAMP.*CONTENT regex

Need to be more flexible for changes like
https://github.com/thesofproject/sof/pull/4086 or
https://github.com/thesofproject/sof/pull/4105

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 test-case/check-sof-logger.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-case/check-sof-logger.sh b/test-case/check-sof-logger.sh
index 77f86dd4..c36199af 100755
--- a/test-case/check-sof-logger.sh
+++ b/test-case/check-sof-logger.sh
@@ -76,7 +76,7 @@ fw_log_err=$(grep -i 'error' "$data_file" | grep -v '\.c\:[1-9]')
 
 # '[[:blank:]]TIMESTAMP.*CONTENT$' to filter the log header:
 # TIMESTAMP  DELTA C# COMPONENT  LOCATION  CONTENT
-if [[ ! $(sed -n '/[[:blank:]]TIMESTAMP.*CONTENT$/p' "${data_file}") ]]; then
+if [[ ! $(sed -n '/TIMESTAMP.*CONTENT/p' "${data_file}") ]]; then
     dloge "Log header not found in ${data_file}"
     func_logger_exit 1
 # we catch error from fw log

From 6a42ab5a2448487b78d2b8199cbfb6f2979a0754 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Tue, 27 Apr 2021 15:55:26 -0700
Subject: [PATCH 2/2] check-sof-logger: change BEG>> to BEG:: to avoid HTML
 conflict

Also change <<END to ::END and print both files always.

<< and >> seem to corrupt the generated HTML and I could not find
anything parsing these anyway as of now.

See discussion in (much larger) PR #666 for more details.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 test-case/check-sof-logger.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/test-case/check-sof-logger.sh b/test-case/check-sof-logger.sh
index c36199af..c30be25b 100755
--- a/test-case/check-sof-logger.sh
+++ b/test-case/check-sof-logger.sh
@@ -56,10 +56,14 @@ sudo pkill -9 "$(basename "$loggerBin")" 2> /dev/null
 
 func_logger_exit()
 {
-    local code=$1 type=${2:-data}
-    dlogi "Log $type BEG>>"
-    cat "$LOG_ROOT/logger.$type.log"
-    dlogi "<<END $type data"
+    local code=$1
+
+    for ftype in data error; do
+        printf '\n'
+        dlogi "Log $ftype BEG::"
+        cat "$LOG_ROOT/logger.$ftype.log"
+        dlogi "::END $ftype"
+    done
     exit "$code"
 }
 
@@ -67,7 +71,7 @@ func_logger_exit()
 logger_err=$(grep -i 'error' "$error_file")
 if [[ $logger_err ]]; then
     dloge "No available log to export due to sof-logger errors."
-    func_logger_exit 1 'error'
+    func_logger_exit 1
 fi
 
 # '\.c\:[1-9]' to filter like '.c:6' this type keyword like: