diff --git a/local/scripts/test-uhci-runtime-qemu.sh b/local/scripts/test-uhci-runtime-qemu.sh index fecc4ca0ec..1288c881c7 100755 --- a/local/scripts/test-uhci-runtime-qemu.sh +++ b/local/scripts/test-uhci-runtime-qemu.sh @@ -16,7 +16,9 @@ # proof style. Proof markers come straight from # local/recipes/drivers/uhcid/source/src/main.rs: # "UHCI USB 1.1 at " (main.rs:487 — controller bound) -# "uhcid: controller initialized, polling ports" (main.rs:535 — init done) +# "uhcid: controller initialized, polling ports" (main.rs:535 — init +# done; note ctrl.name is interpolated, e.g. "uhcid: uhci0_uhci controller +# initialized, polling ports", so the grep uses a regex, not a literal) # "uhcid: port connect detected" (main.rs:545 — port event) # "uhcid: port device : class " (main.rs:551 — enumerated) @@ -149,9 +151,10 @@ if [[ "$check_mode" -eq 1 ]]; then fi # 2. Frame list allocated and the polling loop started. - if ! grep -q "uhcid: controller initialized, polling ports" "$log_file"; then + if ! grep -Eq 'uhcid: .* controller initialized, polling ports' "$log_file"; then echo "ERROR: uhcid did not finish controller initialization" >&2 - echo " Expected: 'uhcid: controller initialized, polling ports'" >&2 + echo " Expected: 'uhcid: controller initialized, polling ports'" >&2 + echo " (main.rs:535 interpolates ctrl.name, e.g. 'uhcid: uhci0_uhci controller initialized, polling ports')" >&2 echo " See $log_file" >&2 exit 1 fi