ci: add U-Boot specific fetch strings
authorChristian Gmeiner <christian.gmeiner@gmail.com>
Thu, 4 Jun 2020 10:56:00 +0000 (12:56 +0200)
committerMarge Bot <eric+marge@anholt.net>
Fri, 5 Jun 2020 11:02:35 +0000 (11:02 +0000)
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>

.gitlab-ci/bare-metal/fastboot.sh

index 2bf4ac2a5c1417d212ce4eb36714175153a551ed..d9360d2140e70f2a2830976a854be3faacef5e17 100755 (executable)
@@ -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