From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Thu, 4 Jun 2020 10:56:00 +0000 (+0200)
Subject: ci: add U-Boot specific fetch strings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b7de75b4b252e1a535635e96baecedf3d98bd7a;p=mesa.git

ci: add U-Boot specific fetch strings

U-Boot's fastboot over udp generates the following output:
  Listening for fastboot command on x.y.z.w

Also add a general 'data abort' error string seen with an
too old U-Boot version:
  https://github.com/u-boot/u-boot/commit/95712af

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5258>
---

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 2bf4ac2a5c1..d9360d2140e 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -78,7 +78,11 @@ done
 PATH=$BM:$PATH $BM_POWERUP
 
 # Once fastboot is ready, boot our image.
-$BM/expect-output.sh artifacts/serial-output.txt -f "fastboot: processing commands"
+$BM/expect-output.sh artifacts/serial-output.txt \
+  -f "fastboot: processing commands" \
+  -f "Listening for fastboot command on" \
+  -e "data abort"
+
 fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img
 
 # Wait for the device to complete the deqp run