KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>
This commit is contained in:
Eric Anholt 2020-06-08 14:55:53 -07:00 committed by Marge Bot
parent 7ef648c0f3
commit a13209bdec
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/bare-metal/cros-servo.sh
View File

@ -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

4
.gitlab-ci/bare-metal/fastboot.sh
View File

@ -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

4
.gitlab-ci/bare-metal/init.sh
View File

@ -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