Extract new grep_firmware_info_in_logs() from verify-sof-firmware-load

Extract new function grep_firmware_info_in_logs() from verify-sof-firmware-load.sh for re-use in other tests. Zero functional change. Signed-off-by: Marc Herbert <[email protected]>
thesofproject · Feb 16, 2022 · a73fe26 · a73fe26
1 parent d4c8312
commit a73fe26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/case-lib/lib.sh b/case-lib/lib.sh
@@ -443,6 +443,17 @@ print_module_params()
     echo "----------------------------------------"
 }
 
+# "$@" is optional, typically: --since=@"$epoch".
+# shellcheck disable=SC2120
+grep_firmware_info_in_logs()
+{
+    # dump the version info and ABI info
+    # "head -n" makes this compatible with set -e.
+    journalctl_cmd "$@" | grep "Firmware info" -A1 | head -n 12
+    # dump the debug info
+    journalctl_cmd "$@" | grep "Firmware debug build" -A3 | head -n 12
+}
+
 # check if NTP Synchronized, if so return 0 otherwise return 1
 check_ntp_sync()
 {

diff --git a/test-case/verify-sof-firmware-load.sh b/test-case/verify-sof-firmware-load.sh
@@ -26,10 +26,8 @@ cmd="journalctl_cmd"
 
 dlogi "Checking SOF Firmware load info in kernel log"
 if $cmd | grep -q " sof-audio.*Firmware.*version"; then
-    # dump the version info and ABI info
-    $cmd | grep "Firmware info" -A1 | head -n 12
-    # dump the debug info
-    $cmd | grep "Firmware debug build" -A3 | head -n 12
+
+    grep_firmware_info_in_logs
     exit 0
 
 else # failed, show some logs