check-pause-resume: handle volume MAX output in expect

When volume is MAX, current expect misses the case. Why volume is MAX is separate problem. Expect should handle MAX volume case as playing case. And added for handling all of expected cases and if not the known cases, the last case is error. This is example of output from aplay or arecord. 1. Playing "## + | 11%" 2. When paused "=== PAUSE ===" 3. When volume is MAX "##################################################+| MAX" 4. In the beginning of the command, multiple lines of dump-hw-params Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
thesofproject · Jul 13, 2022 · eb12965 · eb12965
1 parent e0af412
commit eb12965
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/test-case/check-pause-release-suspend-resume.sh b/test-case/check-pause-release-suspend-resume.sh
@@ -126,7 +126,7 @@ spawn $cmd -D $pcm -r $rate -c $channel -f $fmt -vv -i $dummy_file -q
 set i 1
 set sleep_t $sleep_period
 expect {
-    "#*+*\%" {
+    -re "#.*\%|#.*MAX" {
         #audio stream (aplay or arecord) is active now and playing
         puts "\r===== (\$i/$repeat_count) pb_pbm: Pause $cmd, then wait for ===== "
         puts "\r(\$i/$repeat_count) pb_pbm: $sleep_t ms after pause"
@@ -169,7 +169,17 @@ expect {
         if { \$i > $repeat_count } { exit 0 }
         exp_continue
     }
+    "*:*\n" {
+        puts "\rexpect ignore dump-hw-params"
+        after 10
+        exp_continue
+    }
+    "^?*\n" {
+        puts "\rError: unexpected output detected, exit 1"
+        exit 1
+    }
 }
+exit 1
 AUDIO
 
 ret=$?

diff --git a/test-case/check-pause-resume.sh b/test-case/check-pause-resume.sh
@@ -100,14 +100,14 @@ do
 spawn $cmd $SOF_ALSA_OPTS $cmd_opts -D $dev -r $rate -c $channel -f $fmt -vv -i $file_name -q
 set i 1
 expect {
-    "*#*+*\%" {
+    -re "#.*\%|#.*MAX" {
         set sleep_t [expr int([expr rand() * $rnd_range]) + $rnd_min ]
         puts "\r(\$i/$repeat_count) Wait for \$sleep_t ms before pause"
         send " "
         after \$sleep_t
         exp_continue
     }
-    "*PAUSE*" {
+    "*=== PAUSE*" {
         set sleep_t [expr int([expr rand() * $rnd_range]) + $rnd_min ]
         puts "\r(\$i/$repeat_count) Wait for \$sleep_t ms before resume"
         send " "
@@ -116,13 +116,23 @@ expect {
         if { \$i > $repeat_count } { exit 0 }
         exp_continue
     }
+    "*:*\n" {
+        puts "\rexpect ignore dump-hw-params"
+        after 10
+        exp_continue
+    }
+    "^?*\n" {
+        puts "\rError: unexpected output detected, exit 1"
+        exit 1
+    }
 }
 exit 1
 END
     ret=$?
     #flush the output
     echo
     if [ $ret -ne 0 ]; then
+        echo "Expect block return $ret"
         func_lib_lsof_error_dump "$snd"
         sof-process-kill.sh ||
             dlogw "Kill process catch error"

diff --git a/test-case/multiple-pause-resume.sh b/test-case/multiple-pause-resume.sh
@@ -119,14 +119,14 @@ func_pause_resume_pipeline()
 spawn $cmd -D $dev -r $rate -c $channel -f $fmt -vv -i $file -q
 set i 1
 expect {
-    "*#*+*\%" {
+    -re "#.*\%|#.*MAX" {
         set sleep_t [expr int([expr rand() * $rnd_range]) + $rnd_min ]
         puts "\r(\$i/$repeat_count) pcm'$pcm' cmd'$cmd' id'$idx': Wait for \$sleep_t ms before pause"
         send " "
         after \$sleep_t
         exp_continue
     }
-    "*PAUSE*" {
+    "*=== PAUSE*" {
         set sleep_t [expr int([expr rand() * $rnd_range]) + $rnd_min ]
         puts "\r(\$i/$repeat_count) pcm'$pcm' cmd'$cmd' id'$idx': Wait for \$sleep_t ms before resume"
         send " "
@@ -135,6 +135,15 @@ expect {
         if { \$i > $repeat_count } { exit 0 }
         exp_continue
     }
+    "*:*\n" {
+        puts "\rexpect ignore dump-hw-params"
+        after 10
+        exp_continue
+    }
+    "^?*\n" {
+        puts "\rError: unexpected output detected, exit 1"
+        exit 1
+    }
 }
 exit 1
 END