diff options
author | Eric Anholt <[email protected]> | 2020-06-08 14:55:53 -0700 |
---|---|---|
committer | Marge Bot <[email protected]> | 2020-06-12 23:34:44 +0000 |
commit | a13209bdec8ca5ebd0dcc4b7b33d1fe58028fcb8 (patch) | |
tree | 4768c95eb4999c363e41ad28b166ac3fd485d990 /.gitlab-ci/bare-metal | |
parent | 7ef648c0f309c323b0d3c20dec9c58b2cbf70e58 (diff) |
ci/bare-metal: Reword the final output of the init script on the board.
I'm going to be adding tracie, which isn't deqp.
Reviewed-by: Christian Gmeiner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
Diffstat (limited to '.gitlab-ci/bare-metal')
-rwxr-xr-x | .gitlab-ci/bare-metal/cros-servo.sh | 4 | ||||
-rwxr-xr-x | .gitlab-ci/bare-metal/fastboot.sh | 4 | ||||
-rw-r--r-- | .gitlab-ci/bare-metal/init.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh index 0b978df73a3..43982e07f96 100755 --- a/.gitlab-ci/bare-metal/cros-servo.sh +++ b/.gitlab-ci/bare-metal/cros-servo.sh @@ -76,7 +76,7 @@ $BM/expect-output.sh serial-output.txt -f "load_archive: loading locale_en.bin" $BM/write-serial.py $BM_SERIAL `printf '\016'` # Wait for the device to complete the deqp run -$BM/expect-output.sh serial-output.txt -f "DEQP RESULT" +$BM/expect-output.sh serial-output.txt -f "bare-metal result" # power down the CPU on the device $BM/write-serial.py $BM_SERIAL_EC 'power off' @@ -90,7 +90,7 @@ mkdir -p results cp -Rp /nfs/results/. results/ set +e -if grep -q "DEQP RESULT: pass" serial-output.txt; then +if grep -q "bare-metal result: pass" serial-output.txt; then exit 0 else exit 1 diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index 72d38b4d718..2b1edbac45b 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -92,13 +92,13 @@ $BM/expect-output.sh artifacts/serial-output.txt \ fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img # Wait for the device to complete the deqp run -$BM/expect-output.sh artifacts/serial-output.txt -f "DEQP RESULT" +$BM/expect-output.sh artifacts/serial-output.txt -f "bare-metal result" # power down the device PATH=$BM:$PATH $BM_POWERDOWN set +e -if grep -q "DEQP RESULT: pass" artifacts/serial-output.txt; then +if grep -q "bare-metal result: pass" artifacts/serial-output.txt; then exit 0 else exit 1 diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh index 2dc944da974..93de85c9f28 100644 --- a/.gitlab-ci/bare-metal/init.sh +++ b/.gitlab-ci/bare-metal/init.sh @@ -18,9 +18,9 @@ if [ -e /install/deqp-expected-fails.txt ]; then fi if sh /deqp/deqp-runner.sh; then - echo "DEQP RESULT: pass" + echo "bare-metal result: pass" else - echo "DEQP RESULT: fail" + echo "bare-metal result: fail" fi # Wait until the job would have timed out anyway, so we don't spew a "init |